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

(improvement)(Headless) fix JSON error (#841)

Browse Source
This commit is contained in:
lexluo09
2024-03-20 21:41:02 +08:00
committed by GitHub
parent bb6ee3ae83
commit 416542e6dc
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetModelConfig.java
View File

@@ -14,7 +14,7 @@ public class DataSetModelConfig {
private Long id;
private boolean includesAll;
private Boolean includesAll = false;
private List<Long> metrics = Lists.newArrayList();

8
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java
View File

@@ -1,20 +1,16 @@
package com.tencent.supersonic.headless.api.pojo.request;
import com.tencent.supersonic.common.pojo.DateConf;
import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Data
@ToString
public class ItemValueReq {
private SchemaElementType type;
@NotNull
private Long itemId;
private Long id;
private DateConf dateConf;

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java
View File

@@ -49,7 +49,7 @@ public class DataSetResp extends SchemaItem {
}
public List<Long> getAllIncludeAllModels() {
return getDataSetModelConfigs().stream().filter(DataSetModelConfig::isIncludesAll)
return getDataSetModelConfigs().stream().filter(DataSetModelConfig::getIncludesAll)
.map(DataSetModelConfig::getId)
.collect(Collectors.toList());
}

5
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java
View File

@@ -56,9 +56,9 @@ public class TagQueryServiceImpl implements TagQueryService {
@Override
public ItemValueResp queryTagValue(ItemValueReq itemValueReq, User user) throws Exception {
ItemValueResp itemValueResp = new ItemValueResp();
itemValueResp.setItemId(itemValueReq.getItemId());
itemValueResp.setItemId(itemValueReq.getId());
itemValueResp.setType(SchemaElementType.TAG);
TagResp tag = tagMetaService.getTag(itemValueReq.getItemId(), user);
TagResp tag = tagMetaService.getTag(itemValueReq.getId(), user);
if (Objects.isNull(tag)) {
return null;
}
@@ -88,6 +88,7 @@ public class TagQueryServiceImpl implements TagQueryService {
ModelResp model = modelService.getModel(tag.getModelId());
List<Dim> timeDimension = model.getTimeDimension();
if (CollectionUtils.isEmpty(timeDimension)) {
itemValueReq.setDateConf(null);
return;
}

4
launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryTagValueTest.java
View File

@@ -3,7 +3,6 @@ package com.tencent.supersonic.headless;
import static org.junit.Assert.assertTrue;
import com.tencent.supersonic.auth.api.authentication.pojo.User;
import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
import com.tencent.supersonic.headless.api.pojo.request.ItemValueReq;
import com.tencent.supersonic.headless.api.pojo.response.ItemValueResp;
import com.tencent.supersonic.headless.server.service.TagQueryService;
@@ -18,8 +17,7 @@ public class QueryTagValueTest extends BaseTest {
@Test
public void testQueryTagValue() throws Exception {
ItemValueReq itemValueReq = new ItemValueReq();
itemValueReq.setItemId(1L);
itemValueReq.setType(SchemaElementType.DIMENSION);
itemValueReq.setId(1L);
ItemValueResp itemValueResp = tagQueryService.queryTagValue(itemValueReq, User.getFakeUser());
assertTrue(itemValueResp != null);
}