Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

테마별 향수 추천 API 추가 #320

Merged
merged 2 commits into from
Dec 23, 2023
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
11 changes: 11 additions & 0 deletions perfume-api/src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,17 @@ include::{snippets}/get-perfume/http-request.adoc[]
include::{snippets}/get-perfume/http-response.adoc[]
include::{snippets}/get-perfume/response-fields.adoc[]

== 향수 테마 조회
=== 요청
include::{snippets}/get-perfume-theme/http-request.adoc[]

=== 응답
include::{snippets}/get-perfume-theme/http-response.adoc[]
include::{snippets}/get-perfume-theme/response-fields.adoc[]

=== 실패 응답
include::{snippets}/get-perfume-theme-failed/http-response.adoc[]

== 향수 검색
=== 요청
include::{snippets}/search-perfume/http-request.adoc[]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.perfume.api.perfume.adapter.in.http;

import io.perfume.api.perfume.adapter.in.http.dto.PerfumeThemeResponseDto;
import io.perfume.api.perfume.application.port.in.GetPerfumeThemeUseCase;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/v1/perfume-themes")
@RequiredArgsConstructor
public class PerfumeThemeController {

private final GetPerfumeThemeUseCase getPerfumeThemeUseCase;

@GetMapping("/recent")
public PerfumeThemeResponseDto getRecentTheme() {
return PerfumeThemeResponseDto.from(getPerfumeThemeUseCase.getRecentTheme());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package io.perfume.api.perfume.adapter.in.http.dto;

import io.perfume.api.perfume.application.port.in.dto.PerfumeThemeResult;
import java.util.List;

public record PerfumeThemeResponseDto(
String title, String content, String thumbnail, List<SimplePerfumeResponseDto> perfumes) {
public static PerfumeThemeResponseDto from(PerfumeThemeResult perfumeThemeResult) {
return new PerfumeThemeResponseDto(
perfumeThemeResult.title(),
perfumeThemeResult.content(),
perfumeThemeResult.thumbnail(),
perfumeThemeResult.perfumes().stream().map(SimplePerfumeResponseDto::of).toList());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@ public Optional<Perfume> findPerfumeById(Long id) {
return Optional.of(perfumeMapper.toPerfume(entity));
}

@Override
public List<SimplePerfumeResult> findPerfumesByIds(List<Long> ids) {
return jpaQueryFactory
.select(
Projections.constructor(
SimplePerfumeResult.class,
perfumeJpaEntity.id,
perfumeJpaEntity.name,
perfumeJpaEntity.concentration,
brandEntity.name,
fileJpaEntity.url))
.from(perfumeJpaEntity)
.where(perfumeJpaEntity.id.in(ids), perfumeJpaEntity.deletedAt.isNull())
.leftJoin(brandEntity)
.on(perfumeJpaEntity.brandId.eq(brandEntity.id))
.fetchJoin()
.leftJoin(fileJpaEntity)
.on(perfumeJpaEntity.thumbnailId.eq(fileJpaEntity.id))
.fetchJoin()
.fetch();
}

@Override
public NotePyramid getNotePyramidByPerfume(Long perfumeId) {
List<Tuple> result =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package io.perfume.api.perfume.adapter.out.persistence.perfumeTheme;

import io.perfume.api.base.BaseTimeEntity;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity(name = "perfume_theme")
@Getter
@NoArgsConstructor
public class PerfumeThemeEntity extends BaseTimeEntity {
@Id private Long id;
private String title;
private String content;
private Long thumbnailId;
private String perfumeIds;

public PerfumeThemeEntity(
Long id, String title, String content, Long thumbnailId, String perfumeIds) {
this.id = id;
this.title = title;
this.content = content;
this.thumbnailId = thumbnailId;
this.perfumeIds = perfumeIds;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package io.perfume.api.perfume.adapter.out.persistence.perfumeTheme;

import static io.perfume.api.perfume.adapter.out.persistence.perfumeTheme.QPerfumeThemeEntity.perfumeThemeEntity;

import com.querydsl.jpa.impl.JPAQueryFactory;
import io.perfume.api.base.PersistenceAdapter;
import io.perfume.api.perfume.adapter.out.persistence.perfumeTheme.mapper.PerfumeThemeMapper;
import io.perfume.api.perfume.application.port.out.PerfumeThemeQueryRepository;
import io.perfume.api.perfume.domain.PerfumeTheme;
import java.util.Optional;
import lombok.RequiredArgsConstructor;

@PersistenceAdapter
@RequiredArgsConstructor
public class PerfumeThemeQueryPersistenceAdapter implements PerfumeThemeQueryRepository {

private final JPAQueryFactory jpaQueryFactory;

@Override
public Optional<PerfumeTheme> getRecentTheme() {
PerfumeThemeEntity entity =
jpaQueryFactory
.select(perfumeThemeEntity)
.from(perfumeThemeEntity)
.orderBy(perfumeThemeEntity.id.desc())
.where(perfumeThemeEntity.deletedAt.isNull())
.fetchFirst();

return Optional.ofNullable(PerfumeThemeMapper.fromEntity(entity));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package io.perfume.api.perfume.adapter.out.persistence.perfumeTheme.mapper;

import io.perfume.api.perfume.adapter.out.persistence.perfumeTheme.PerfumeThemeEntity;
import io.perfume.api.perfume.domain.PerfumeTheme;
import java.util.Arrays;
import java.util.List;

public class PerfumeThemeMapper {
private PerfumeThemeMapper() {}

public static PerfumeTheme fromEntity(PerfumeThemeEntity entity) {
if (entity == null) {
return null;
}

List<Long> perfumeIds =
Arrays.stream(entity.getPerfumeIds().split(",")).map(Long::parseLong).toList();

return PerfumeTheme.builder()
.title(entity.getTitle())
.content(entity.getContent())
.thumbnailId(entity.getThumbnailId())
.perfumeIds(perfumeIds)
.createdAt(entity.getCreatedAt())
.updatedAt(entity.getUpdatedAt())
.deletedAt(entity.getDeletedAt())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package io.perfume.api.perfume.application.exception;

import io.perfume.api.base.CustomHttpException;
import io.perfume.api.base.LogLevel;
import org.springframework.http.HttpStatus;

public class PerfumeThemeNotFoundException extends CustomHttpException {
public PerfumeThemeNotFoundException() {
super(
HttpStatus.NOT_FOUND,
"테마별 향수 추천 데이터가 존재하지 않습니다.",
"테마별 향수 추천 데이터가 존재하지 않습니다.",
LogLevel.WARN);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.perfume.api.perfume.application.port.in;

import io.perfume.api.perfume.application.port.in.dto.PerfumeThemeResult;

public interface GetPerfumeThemeUseCase {
PerfumeThemeResult getRecentTheme();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.perfume.api.perfume.application.port.in.dto;

import java.util.List;

public record PerfumeThemeResult(
String title, String content, String thumbnail, List<SimplePerfumeResult> perfumes) {}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public interface PerfumeQueryRepository {

Optional<Perfume> findPerfumeById(Long id);

List<SimplePerfumeResult> findPerfumesByIds(List<Long> ids);

NotePyramid getNotePyramidByPerfume(Long perfumeId);

CustomSlice<SimplePerfumeResult> findPerfumesByBrand(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.perfume.api.perfume.application.port.out;

import io.perfume.api.perfume.domain.PerfumeTheme;
import java.util.Optional;

public interface PerfumeThemeQueryRepository {
Optional<PerfumeTheme> getRecentTheme();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package io.perfume.api.perfume.application.service;

import io.perfume.api.file.application.exception.FileNotFoundException;
import io.perfume.api.file.application.port.in.FindFileUseCase;
import io.perfume.api.perfume.application.exception.PerfumeThemeNotFoundException;
import io.perfume.api.perfume.application.port.in.GetPerfumeThemeUseCase;
import io.perfume.api.perfume.application.port.in.dto.PerfumeThemeResult;
import io.perfume.api.perfume.application.port.in.dto.SimplePerfumeResult;
import io.perfume.api.perfume.application.port.out.PerfumeQueryRepository;
import io.perfume.api.perfume.application.port.out.PerfumeThemeQueryRepository;
import io.perfume.api.perfume.domain.PerfumeTheme;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
public class GetPerfumeThemeService implements GetPerfumeThemeUseCase {

private final PerfumeQueryRepository perfumeQueryRepository;
private final PerfumeThemeQueryRepository perfumeThemeQueryRepository;
private final FindFileUseCase findFileUseCase;

public PerfumeThemeResult getRecentTheme() {
PerfumeTheme perfumeTheme =
perfumeThemeQueryRepository
.getRecentTheme()
.orElseThrow(PerfumeThemeNotFoundException::new);
List<SimplePerfumeResult> perfumes =
perfumeQueryRepository.findPerfumesByIds(perfumeTheme.getPerfumeIds());
String thumbnail =
findFileUseCase
.findFileById(perfumeTheme.getThumbnailId())
.orElseThrow(() -> new FileNotFoundException(perfumeTheme.getThumbnailId()))
.getUrl();
return new PerfumeThemeResult(
perfumeTheme.getTitle(), perfumeTheme.getContent(), thumbnail, perfumes);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.perfume.api.perfume.domain;

import io.perfume.api.base.BaseTimeDomain;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Builder;
import lombok.Getter;

@Getter
public class PerfumeTheme extends BaseTimeDomain {
private Long id;
private String title;
private String content;
private Long thumbnailId;
private List<Long> perfumeIds;

@Builder
public PerfumeTheme(
String title,
String content,
Long thumbnailId,
List<Long> perfumeIds,
LocalDateTime createdAt,
LocalDateTime updatedAt,
LocalDateTime deletedAt) {
super(createdAt, updatedAt, deletedAt);
this.title = title;
this.content = content;
this.thumbnailId = thumbnailId;
this.perfumeIds = perfumeIds;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
create table perfume_theme(
id int primary key auto_increment,
title varchar(100) not null,
content varchar(1000) not null,
thumbnail_id bigint not null,
perfume_ids varchar(255) not null,
created_at datetime not null,
updated_at datetime not null,
deleted_at datetime null
);
Loading