topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add tagTest and pot TagCustomMapper.xml (#833)

Browse Source
This commit is contained in:
daikon
2024-03-19 23:08:50 +08:00
committed by GitHub
parent 5929c2aa90
commit 7a4c19f5b6
7 changed files with 150 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java
View File

@@ -72,7 +72,8 @@ public class TagMetaServiceImpl implements TagMetaService {
@Override
public TagResp create(TagReq tagReq, User user) {
checkExit(tagReq);
checkExist(tagReq);
checkTagObject(tagReq);
TagDO tagDO = convert(tagReq);
Date date = new Date();
tagDO.setId(null);
@@ -81,7 +82,7 @@ public class TagMetaServiceImpl implements TagMetaService {
tagDO.setUpdatedBy(user.getName());
tagDO.setUpdatedAt(date);
tagRepository.create(tagDO);
return convert2Resp(tagDO);
return getTag(tagDO.getId(), user);
}
@Override
@@ -108,6 +109,10 @@ public class TagMetaServiceImpl implements TagMetaService {
public TagResp getTag(Long id, User user) {
TagDO tagDO = tagRepository.getTagById(id);
TagResp tagResp = convert2Resp(tagDO);
List<TagResp> tagRespList = Arrays.asList(tagResp);
fillModelInfo(tagRespList);
fillDomainInfo(tagRespList);
tagResp = tagRespList.get(0);
tagResp = fillTagObjectInfo(tagResp, user);
tagResp = fillCollectAndAdminInfo(tagResp, user);
return tagResp;
@@ -190,6 +195,7 @@ public class TagMetaServiceImpl implements TagMetaService {
private TagResp convert2Resp(TagDO tagDO) {
TagResp tagResp = new TagResp();
BeanUtils.copyProperties(tagDO, tagResp);
tagResp.setTagDefineType(tagDO.getType());
if (TagDefineType.METRIC.name().equalsIgnoreCase(tagDO.getType())) {
MetricResp metric = metricService.getMetric(tagDO.getItemId());
tagResp.setBizName(metric.getBizName());
@@ -279,13 +285,6 @@ public class TagMetaServiceImpl implements TagMetaService {
return dimensions.size();
}
private TagResp fillModelInfo(TagResp tagResp) {
ModelResp model = modelService.getModel(tagResp.getModelId());
tagResp.setModelName(model.getName());
tagResp.setDomainId(model.getDomainId());
return tagResp;
}
private void fillModelInfo(List<TagResp> tagRespList) {
Map<Long, ModelResp> modelIdAndRespMap = modelService.getModelMap();
tagRespList.stream().forEach(tagResp -> {
@@ -303,6 +302,8 @@ public class TagMetaServiceImpl implements TagMetaService {
.map(CollectDO::getCollectId).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(collectIds) && collectIds.contains(tagResp.getId())) {
tagResp.setIsCollect(true);
} else {
tagResp.setIsCollect(false);
}
List<TagResp> tagRespList = Arrays.asList(tagResp);
fillAdminRes(tagRespList, user);
@@ -324,7 +325,7 @@ public class TagMetaServiceImpl implements TagMetaService {
}
}
private void checkExit(TagReq tagReq) {
private void checkExist(TagReq tagReq) {
TagFilter tagFilter = new TagFilter();
tagFilter.setTagDefineType(tagReq.getTagDefineType());
if (Objects.nonNull(tagReq.getItemId())) {
@@ -337,6 +338,25 @@ public class TagMetaServiceImpl implements TagMetaService {
}
}
private void checkTagObject(TagReq tagReq) {
if (TagDefineType.DIMENSION.equals(tagReq.getTagDefineType())) {
DimensionResp dimension = dimensionService.getDimension(tagReq.getItemId());
ModelResp model = modelService.getModel(dimension.getModelId());
if (Objects.isNull(model.getTagObjectId())) {
throw new RuntimeException(String.format("this dimension:{} is not supported to create tag",
tagReq.getItemId()));
}
}
if (TagDefineType.METRIC.equals(tagReq.getTagDefineType())) {
MetricResp metric = metricService.getMetric(tagReq.getItemId());
ModelResp model = modelService.getModel(metric.getModelId());
if (Objects.isNull(model.getTagObjectId())) {
throw new RuntimeException(String.format("this metric:{} is not supported to create tag",
tagReq.getItemId()));
}
}
}
private TagDO convert(TagReq tagReq) {
TagDO tagDO = new TagDO();
BeanUtils.copyProperties(tagReq, tagDO);

14
headless/server/src/main/resources/mapper/custom/TagCustomMapper.xml
View File

@@ -20,7 +20,7 @@
<result column="model_name" jdbcType="VARCHAR" property="modelName" />
<result column="tag_object_id" jdbcType="BIGINT" property="tagObjectId" />
<result column="tag_object_name" jdbcType="VARCHAR" property="tagObjectName" />
<result column="tag_define_type" jdbcType="VARCHAR" property="tagDefineType" />
<result column="type" jdbcType="VARCHAR" property="tagDefineType" />
<result column="item_id" jdbcType="VARCHAR" property="itemId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="biz_name" jdbcType="VARCHAR" property="bizName" />
@@ -45,28 +45,28 @@
</foreach>
</if>
<if test="tagDefineType != null">
and tag_define_type = #{tagDefineType}
and type = #{tagDefineType}
</if>
</where>
</select>
<select id="queryTagRespList" resultMap="TagResp">
select * from (
select s2_tag.id as id, s2_dimension.model_id as model_id, 'DIMENSION' as tag_define_type, s2_dimension.id as item_id,
select s2_tag.id as id, s2_dimension.model_id as model_id, 'DIMENSION' as type, s2_dimension.id as item_id,
s2_dimension.name as name, s2_dimension.biz_name as biz_name, s2_dimension.description as description, s2_tag.updated_at as updated_at
from s2_tag join s2_dimension
on s2_tag.item_id = s2_dimension.id
where s2_dimension.status=1
where s2_dimension.status=1 and s2_tag.type='DIMENSION'
union
select s2_tag.id as id, s2_metric.model_id as model_id, 'METRIC' as tag_define_type, s2_metric.id as item_id,
select s2_tag.id as id, s2_metric.model_id as model_id, 'METRIC' as type, s2_metric.id as item_id,
s2_metric.name as name, s2_metric.biz_name as biz_name, s2_metric.description as description, s2_tag.updated_at as updated_at
from s2_tag join s2_metric
on s2_tag.item_id = s2_metric.id
where s2_metric.status=1
where s2_metric.status=1 and s2_tag.type='METRIC'
)t
<where>
<if test="tagDefineType != null">
and tag_define_type = #{tagDefineType}
and type = #{tagDefineType}
</if>
<if test="itemIds != null and itemIds.size >0">
and item_id in

27
launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java
View File

@@ -46,6 +46,7 @@ import com.tencent.supersonic.headless.api.pojo.request.DimensionReq;
import com.tencent.supersonic.headless.api.pojo.request.DomainReq;
import com.tencent.supersonic.headless.api.pojo.request.MetricReq;
import com.tencent.supersonic.headless.api.pojo.request.ModelReq;
import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq;
import com.tencent.supersonic.headless.server.service.DataSetService;
import com.tencent.supersonic.headless.server.service.DatabaseService;
import com.tencent.supersonic.headless.server.service.DimensionService;
@@ -58,6 +59,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.tencent.supersonic.headless.server.service.TagObjectService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +90,8 @@ public class ModelDemoDataLoader {
private DataSetService dataSetService;
@Autowired
private DataSourceProperties dataSourceProperties;
@Autowired
private TagObjectService tagObjectService;
@Autowired
private TagMetaService tagMetaService;
@@ -95,6 +100,8 @@ public class ModelDemoDataLoader {
try {
addDatabase();
addDomain();
addTagObjectUser();
addTagObjectSinger();
addModel_1();
addModel_2();
addMetric_uv();
@@ -117,6 +124,24 @@ public class ModelDemoDataLoader {
}
private void addTagObjectUser() throws Exception {
TagObjectReq tagObjectReq = new TagObjectReq();
tagObjectReq.setDomainId(1L);
tagObjectReq.setName("用户");
tagObjectReq.setBizName("user");
User user = User.getFakeUser();
tagObjectService.create(tagObjectReq, user);
}
private void addTagObjectSinger() throws Exception {
TagObjectReq tagObjectReq = new TagObjectReq();
tagObjectReq.setDomainId(2L);
tagObjectReq.setName("艺人");
tagObjectReq.setBizName("singer");
User user = User.getFakeUser();
tagObjectService.create(tagObjectReq, user);
}
public void addDatabase() {
String url = dataSourceProperties.getUrl();
DatabaseReq databaseReq = new DatabaseReq();
@@ -155,6 +180,7 @@ public class ModelDemoDataLoader {
modelReq.setDescription("用户部门信息");
modelReq.setDatabaseId(1L);
modelReq.setDomainId(1L);
modelReq.setTagObjectId(1L);
modelReq.setViewers(Arrays.asList("admin", "tom", "jack"));
modelReq.setViewOrgs(Collections.singletonList("1"));
modelReq.setAdmins(Arrays.asList("admin", "alice"));
@@ -309,6 +335,7 @@ public class ModelDemoDataLoader {
modelReq.setDescription("艺人库");
modelReq.setDatabaseId(1L);
modelReq.setDomainId(2L);
modelReq.setTagObjectId(2L);
modelReq.setViewers(Arrays.asList("admin", "tom", "jack"));
modelReq.setViewOrgs(Collections.singletonList("1"));
modelReq.setAdmins(Collections.singletonList("admin"));

1
launchers/standalone/src/main/resources/config.update/sql-update.sql
View File

@@ -258,7 +258,6 @@ CREATE TABLE IF NOT EXISTS s2_tag(
`id` INT NOT NULL AUTO_INCREMENT,
`item_id` INT NOT NULL ,
`type` varchar(255) NOT NULL ,
`tag_define_type` varchar(20) NOT NULL , --DIMENSION,METRIC
`created_at` TIMESTAMP NOT NULL ,
`created_by` varchar(100) NOT NULL ,
`updated_at` TIMESTAMP DEFAULT NULL ,

1
launchers/standalone/src/main/resources/db/schema-h2.sql
View File

@@ -579,7 +579,6 @@ CREATE TABLE IF NOT EXISTS `s2_data_set` (
CREATE TABLE IF NOT EXISTS `s2_tag` (
`id` INT NOT NULL AUTO_INCREMENT,
`item_id` INT NOT NULL ,
`tag_define_type` varchar(20) NOT NULL , --DIMENSION,METRIC
`type` varchar(50) NOT NULL , -- ATOMIC, DERIVED
`created_at` TIMESTAMP NOT NULL ,
`created_by` varchar(100) NOT NULL ,

85
launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java Normal file
View File

@@ -0,0 +1,85 @@
package com.tencent.supersonic.headless;
import com.github.pagehelper.PageInfo;
import com.tencent.supersonic.auth.api.authentication.pojo.User;
import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType;
import com.tencent.supersonic.headless.api.pojo.request.TagDeleteReq;
import com.tencent.supersonic.headless.api.pojo.request.TagFilterPageReq;
import com.tencent.supersonic.headless.api.pojo.request.TagReq;
import com.tencent.supersonic.headless.api.pojo.response.TagResp;
import com.tencent.supersonic.headless.server.pojo.TagFilter;
import com.tencent.supersonic.headless.server.service.TagMetaService;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Arrays;
import java.util.List;
public class TagTest extends BaseTest {
@Autowired
private TagMetaService tagMetaService;
private User user = User.getFakeUser();
public TagReq newTagReq() {
TagReq tagReq = new TagReq();
tagReq.setTagDefineType(TagDefineType.DIMENSION);
tagReq.setItemId(4L);
return tagReq;
}
public TagReq newTagReqV1() {
TagReq tagReq = new TagReq();
tagReq.setTagDefineType(TagDefineType.DIMENSION);
tagReq.setItemId(5L);
return tagReq;
}
public TagReq newTagReqV2() {
TagReq tagReq = new TagReq();
tagReq.setTagDefineType(TagDefineType.DIMENSION);
tagReq.setItemId(1L);
return tagReq;
}
@Test
void testCreateTag() {
TagReq tagReq = newTagReq();
tagMetaService.create(tagReq, user);
TagReq tagReq1 = newTagReqV1();
tagMetaService.create(tagReq1, user);
List<TagResp> tags = tagMetaService.getTags(new TagFilter());
Assert.assertEquals(2, tags.size());
TagDeleteReq tagDeleteReq = new TagDeleteReq();
tagDeleteReq.setType(TagDefineType.DIMENSION);
tagDeleteReq.setItemIds(Arrays.asList(4L, 5L));
tagMetaService.deleteBatch(tagDeleteReq, user);
List<TagResp> tags1 = tagMetaService.getTags(new TagFilter());
Assert.assertEquals(0, tags1.size());
}
@Test
void testTagMarket() {
TagReq tagReq = newTagReq();
tagMetaService.create(tagReq, user);
TagReq tagReq1 = newTagReqV1();
tagMetaService.create(tagReq1, user);
TagReq tagReq2 = newTagReqV2();
tagMetaService.create(tagReq2, user);
TagFilterPageReq filter = new TagFilterPageReq();
filter.setTagObjectId(2L);
filter.setKey("区域");
PageInfo<TagResp> tags = tagMetaService.queryTagMarketPage(filter, user);
Assert.assertEquals(1, tags.getList().size());
TagDeleteReq tagDeleteReq = new TagDeleteReq();
tagDeleteReq.setType(TagDefineType.DIMENSION);
tagDeleteReq.setItemIds(Arrays.asList(1L, 4L, 5L));
tagMetaService.deleteBatch(tagDeleteReq, user);
List<TagResp> tags1 = tagMetaService.getTags(new TagFilter());
Assert.assertEquals(0, tags1.size());
}
}

3
launchers/standalone/src/test/resources/db/schema-h2.sql
View File

@@ -580,8 +580,7 @@ CREATE TABLE IF NOT EXISTS `s2_data_set` (
CREATE TABLE IF NOT EXISTS `s2_tag` (
`id` INT NOT NULL AUTO_INCREMENT,
`item_id` INT NOT NULL ,
`type` varchar(50) NOT NULL , -- ATOMIC, DERIVED
`tag_define_type` varchar(20) NOT NULL , --DIMENSION,METRIC
`type` varchar(50) NOT NULL ,
`created_at` TIMESTAMP NOT NULL ,
`created_by` varchar(100) NOT NULL ,
`updated_at` TIMESTAMP DEFAULT NULL ,