diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java index e84ba7abf..54cc0d20e 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java @@ -53,11 +53,10 @@ public class S2ArtistDemo extends S2BaseDemo { public void doRun() { try { DomainResp singerDomain = addDomain(); - DomainResp singerModelSet = addModelSet(singerDomain); TagObjectResp singerTagObject = addTagObjectSinger(singerDomain); - ModelResp singerModel = addModel(singerModelSet, demoDatabaseResp, singerTagObject); + ModelResp singerModel = addModel(singerDomain, demoDatabaseResp, singerTagObject); addTags(singerModel); - long dataSetId = addDataSet(singerDomain, singerModelSet, singerModel); + long dataSetId = addDataSet(singerDomain, singerModel); addAgent(dataSetId); } catch (Exception e) { log.error("Failed to add model demo data", e); @@ -99,15 +98,6 @@ public class S2ArtistDemo extends S2BaseDemo { return domainService.createDomain(domainReq, user); } - public DomainResp addModelSet(DomainResp singerDomain) { - DomainReq domainReq = new DomainReq(); - domainReq.setName("标签模型集"); - domainReq.setBizName("singer_info"); - domainReq.setParentId(singerDomain.getId()); - domainReq.setStatus(StatusEnum.ONLINE.getCode()); - return domainService.createDomain(domainReq, user); - } - public ModelResp addModel(DomainResp singerDomain, DatabaseResp s2Database, TagObjectResp singerTagObject) throws Exception { ModelReq modelReq = new ModelReq(); @@ -164,14 +154,14 @@ public class S2ArtistDemo extends S2BaseDemo { TagDefineType.METRIC); } - public long addDataSet(DomainResp singerDomain, DomainResp singerModelSet, ModelResp singerModel) { + public long addDataSet(DomainResp singerDomain, ModelResp singerModel) { DataSetReq dataSetReq = new DataSetReq(); dataSetReq.setName("艺人库数据集"); dataSetReq.setBizName("singer"); dataSetReq.setDomainId(singerDomain.getId()); dataSetReq.setDescription("包含艺人相关标签和指标信息"); dataSetReq.setAdmins(Lists.newArrayList("admin", "jack")); - List dataSetModelConfigs = getDataSetModelConfigs(singerModelSet.getId()); + List dataSetModelConfigs = getDataSetModelConfigs(singerDomain.getId()); DataSetDetail dataSetDetail = new DataSetDetail(); dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs); dataSetReq.setDataSetDetail(dataSetDetail); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java index 9bd05713d..111aca95b 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java @@ -74,15 +74,14 @@ public class S2VisitsDemo extends S2BaseDemo { try { // create domain DomainResp s2Domain = addDomain(); - DomainResp s2ModelSet = addModelSet(s2Domain); TagObjectResp s2TagObject = addTagObjectUser(s2Domain); // create models - ModelResp userModel = addModel_1(s2ModelSet, demoDatabaseResp, s2TagObject); - ModelResp pvUvModel = addModel_2(s2ModelSet, demoDatabaseResp); - ModelResp stayTimeModel = addModel_3(s2ModelSet, demoDatabaseResp); - addModelRela_1(s2ModelSet, userModel, pvUvModel); - addModelRela_2(s2ModelSet, userModel, stayTimeModel); + ModelResp userModel = addModel_1(s2Domain, demoDatabaseResp, s2TagObject); + ModelResp pvUvModel = addModel_2(s2Domain, demoDatabaseResp); + ModelResp stayTimeModel = addModel_3(s2Domain, demoDatabaseResp); + addModelRela_1(s2Domain, userModel, pvUvModel); + addModelRela_2(s2Domain, userModel, stayTimeModel); addTags(userModel); //create metrics and dimensions @@ -98,7 +97,7 @@ public class S2VisitsDemo extends S2BaseDemo { updateMetric_pv(pvUvModel, departmentDimension, userDimension, metricPv); //create data set - DataSetResp s2DataSet = addDataSet(s2Domain, s2ModelSet); + DataSetResp s2DataSet = addDataSet(s2Domain); addAuthGroup_1(stayTimeModel); addAuthGroup_2(stayTimeModel); @@ -183,15 +182,6 @@ public class S2VisitsDemo extends S2BaseDemo { return domainService.createDomain(domainReq, user); } - public DomainResp addModelSet(DomainResp s2Domain) { - DomainReq domainReq = new DomainReq(); - domainReq.setName("埋点模型集"); - domainReq.setBizName("visit_info"); - domainReq.setParentId(s2Domain.getId()); - domainReq.setStatus(StatusEnum.ONLINE.getCode()); - return domainService.createDomain(domainReq, user); - } - public ModelResp addModel_1(DomainResp s2Domain, DatabaseResp s2Database, TagObjectResp s2TagObject) throws Exception { ModelReq modelReq = new ModelReq(); @@ -448,14 +438,14 @@ public class S2VisitsDemo extends S2BaseDemo { return metricService.createMetric(metricReq, user); } - public DataSetResp addDataSet(DomainResp s2Domain, DomainResp s2ModelSet) { + public DataSetResp addDataSet(DomainResp s2Domain) { DataSetReq dataSetReq = new DataSetReq(); dataSetReq.setName("超音数数据集"); dataSetReq.setBizName("s2"); dataSetReq.setDomainId(s2Domain.getId()); dataSetReq.setDescription("包含超音数访问统计相关的指标和维度等"); dataSetReq.setAdmins(Lists.newArrayList("admin")); - List dataSetModelConfigs = getDataSetModelConfigs(s2ModelSet.getId()); + List dataSetModelConfigs = getDataSetModelConfigs(s2Domain.getId()); DataSetDetail dataSetDetail = new DataSetDetail(); dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs); dataSetReq.setDataSetDetail(dataSetDetail); diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java index 98bb78eae..696b901a1 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java @@ -48,7 +48,7 @@ public class QueryByMetricTest extends BaseTest { Assert.assertNotNull(queryResp.getResultList()); Assert.assertEquals(6, queryResp.getResultList().size()); - queryMetricReq.setDomainId(3L); + queryMetricReq.setDomainId(2L); queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv")); queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department")); assertThrows(IllegalArgumentException.class, diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java index 182daae92..06ab40c35 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java @@ -32,7 +32,7 @@ public class SchemaAuthTest extends BaseTest { User user = DataUtils.getUserAlice(); setDomainNotOpenToAll(); List domainResps = domainService.getDomainListWithAdminAuth(user); - List expectedDomainBizNames = Lists.newArrayList("supersonic", "visit_info", "singer", "singer_info"); + List expectedDomainBizNames = Lists.newArrayList("supersonic", "singer"); Assertions.assertEquals(expectedDomainBizNames, domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList())); } @@ -68,7 +68,7 @@ public class SchemaAuthTest extends BaseTest { public void test_getDomainList_jack() { User user = DataUtils.getUserJack(); List domainResps = domainService.getDomainListWithAdminAuth(user); - List expectedDomainBizNames = Lists.newArrayList("supersonic", "visit_info"); + List expectedDomainBizNames = Lists.newArrayList("supersonic"); Assertions.assertEquals(expectedDomainBizNames, domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList())); }