Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ private UserTagDocument convertToUserTagDocument(Long userId, MatchRequestDto dt
if (dto.getContent().getTypeTags() != null) {
contentTags.addAll(dto.getContent().getTypeTags());
}
if (dto.getContent().getCategoryTags() != null) {
contentTags.addAll(dto.getContent().getCategoryTags());
}
if (dto.getContent().getToneTags() != null) {
contentTags.addAll(dto.getContent().getToneTags());
}
Expand Down Expand Up @@ -706,6 +709,7 @@ private Set<Integer> collectAllTagIds(MatchRequestDto dto) {

if (dto.getContent() != null) {
addAll(tagIds, dto.getContent().getTypeTags());
addAll(tagIds, dto.getContent().getCategoryTags());
addAll(tagIds, dto.getContent().getToneTags());
addAll(tagIds, dto.getContent().getPrefferedInvolvementTags());
addAll(tagIds, dto.getContent().getPrefferedCoverageTags());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public static class FashionDto {
public static class ContentDto {
private SnsDto sns;
private List<Integer> typeTags;
private List<Integer> categoryTags;
private List<Integer> toneTags;
private List<Integer> prefferedInvolvementTags;
private List<Integer> prefferedCoverageTags;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,35 +54,36 @@ CustomResponse<MatchResponseDto> match(
"beauty": {
"interestStyleTags": [1, 2],
"prefferedFunctionTags": [6, 7],
"skinTypeTags": 12,
"skinToneTags": 13,
"makeupStyleTags": 2
"skinTypeTags": 11,
"skinToneTags": 14,
"makeupStyleTags": 19
},
"fashion": {
"interestStyleTags": [16, 17],
"preferredItemTags": [22, 23],
"preferredBrandTags": [27, 28],
"interestStyleTags": [24, 25],
"preferredItemTags": [28, 29],
"preferredBrandTags": [33, 24],
"heightTag": 72,
"weightTypeTag": 94,
"topSizeTag": 108,
"bottomSizeTag": 178
"weightTypeTag": 101,
"topSizeTag": 104,
"bottomSizeTag": 123
},
"content": {
"sns": {
"url": "https://www.instagram.com/vivi",
"mainAudience": {
"genderTags": [221, 222],
"ageTags": [223, 224]
"genderTags": [156],
"ageTags": [161]
},
"averageAudience": {
"videoLengthTags": [228, 229],
"videoViewsTags": [232, 233]
"videoLengthTags": [164, 165],
"videoViewsTags": [168, 169]
}
},
"typeTags": [236, 237],
"toneTags": [245, 246],
"prefferedInvolvementTags": [251, 252],
"prefferedCoverageTags": [255, 256]
"typeTags": [171, 172],
"categoryTags": [178],
"toneTags": [181, 182],
"prefferedInvolvementTags": [188, 189],
"prefferedCoverageTags": [190, 191]
}
}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public MyFeatureResponseDto getMyFeatures(Long userId) {
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.AVG_VIDEO_LENGTH.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.AVG_VIDEO_VIEWS.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.FORMAT.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.CATEGORY.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.TONE.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.INVOLVEMENT.getKorName()),
get(grouped, TagType.CONTENT.getDescription(), ContentTagType.USAGE_RANGE.getKorName())
Expand Down Expand Up @@ -150,6 +151,7 @@ private MatchRequestDto toMatchRequestDtoFromUserTags(List<TagUser> tagUsers, Lo
List<Integer> videoLengthTags = new ArrayList<>();
List<Integer> videoViewsTags = new ArrayList<>();
List<Integer> typeTags = new ArrayList<>();
List<Integer> categoryTags = new ArrayList<>();
List<Integer> toneTags = new ArrayList<>();
List<Integer> preferredInvolvementTags = new ArrayList<>();
List<Integer> preferredCoverageTags = new ArrayList<>();
Expand Down Expand Up @@ -213,6 +215,8 @@ private MatchRequestDto toMatchRequestDtoFromUserTags(List<TagUser> tagUsers, Lo
videoViewsTags.add(tagId);
} else if (ContentTagType.FORMAT.getKorName().equals(category)) {
typeTags.add(tagId);
} else if (ContentTagType.CATEGORY.getKorName().equals(category)) {
categoryTags.add(tagId);
} else if (ContentTagType.TONE.getKorName().equals(category)) {
toneTags.add(tagId);
} else if (ContentTagType.INVOLVEMENT.getKorName().equals(category)) {
Expand Down Expand Up @@ -264,6 +268,7 @@ private MatchRequestDto toMatchRequestDtoFromUserTags(List<TagUser> tagUsers, Lo
.content(MatchRequestDto.ContentDto.builder()
.sns(sns)
.typeTags(typeTags.isEmpty() ? null : typeTags)
.categoryTags(categoryTags.isEmpty() ? null : categoryTags)
.toneTags(toneTags.isEmpty() ? null : toneTags)
.prefferedInvolvementTags(preferredInvolvementTags.isEmpty() ? null : preferredInvolvementTags)
.prefferedCoverageTags(preferredCoverageTags.isEmpty() ? null : preferredCoverageTags)
Expand Down Expand Up @@ -337,6 +342,7 @@ private MatchRequestDto.ContentDto mergeContent(MatchRequestDto.ContentDto cur,
return MatchRequestDto.ContentDto.builder()
.sns(mergeSns(cur.getSns(), p.getSns()))
.typeTags(p.getTypeTags() != null ? p.getTypeTags() : cur.getTypeTags())
.categoryTags(p.getCategoryTags() != null ? p.getCategoryTags() : cur.getCategoryTags())
.toneTags(p.getToneTags() != null ? p.getToneTags() : cur.getToneTags())
.prefferedInvolvementTags(p.getPrefferedInvolvementTags() != null ? p.getPrefferedInvolvementTags() : cur.getPrefferedInvolvementTags())
.prefferedCoverageTags(p.getPrefferedCoverageTags() != null ? p.getPrefferedCoverageTags() : cur.getPrefferedCoverageTags())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public record ContentsType(
List<Integer> avgVideoLength,
List<Integer> avgViews,
List<Integer> contentFormats,
List<Integer> contentCategories,
List<Integer> contentTones,
List<Integer> desiredInvolvement,
List<Integer> desiredUsageScope
Expand Down
Loading