diff --git a/common-module/src/main/java/com/likelion/commonmodule/security/util/AuthConsts.java b/common-module/src/main/java/com/likelion/commonmodule/security/util/AuthConsts.java index a4dd65a..a85e408 100644 --- a/common-module/src/main/java/com/likelion/commonmodule/security/util/AuthConsts.java +++ b/common-module/src/main/java/com/likelion/commonmodule/security/util/AuthConsts.java @@ -9,5 +9,6 @@ public class AuthConsts { public static final String AUTHORIZATION = "Authorization"; public static final String EMPTY_HEADER = null; public static final String REFRESH_TOKEN_HEADER = "RefreshToken"; + public static final String ACCESS_TOKEN_HEADER = "AccessToken"; public static final String AUTHENTICATION_TYPE_PREFIX = AUTHENTICATION_TYPE+" "; } diff --git a/core-module/src/main/java/com/likelion/coremodule/VisitList/domain/VisitList.java b/core-module/src/main/java/com/likelion/coremodule/VisitList/domain/VisitList.java index 5871e78..a49dad3 100644 --- a/core-module/src/main/java/com/likelion/coremodule/VisitList/domain/VisitList.java +++ b/core-module/src/main/java/com/likelion/coremodule/VisitList/domain/VisitList.java @@ -1,6 +1,5 @@ package com.likelion.coremodule.VisitList.domain; -import com.likelion.coremodule.market.domain.Market; import com.likelion.coremodule.store.domain.Store; import com.likelion.coremodule.user.domain.User; import jakarta.persistence.*; @@ -18,11 +17,11 @@ public class VisitList { @Column(name = "visit_id") private Long id; - @OneToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "store_id") private Store store; - @OneToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; diff --git a/core-module/src/main/java/com/likelion/coremodule/market/service/MarketQueryService.java b/core-module/src/main/java/com/likelion/coremodule/market/service/MarketQueryService.java index 979dcda..a95a333 100644 --- a/core-module/src/main/java/com/likelion/coremodule/market/service/MarketQueryService.java +++ b/core-module/src/main/java/com/likelion/coremodule/market/service/MarketQueryService.java @@ -11,7 +11,6 @@ import com.likelion.coremodule.store.service.StoreQueryService; import com.likelion.coremodule.user.application.UserQueryService; import com.likelion.coremodule.user.domain.User; -import com.likelion.coremodule.user.util.UserUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -28,11 +27,9 @@ public Market findMarket(Long id) { return marketRepository.findById(id).orElseThrow(() -> new MarketException(MarketErrorCode.NO_MARKET_INFO)); } - public void saveVisitList(Long storeId) { + public void saveVisitList(Long storeId, String email) { - String email = UserUtils.getEmailFromAccessUser(); User user = userQueryService.findByEmail(email); - Store store = storeQueryService.findStoreById(storeId); final VisitList visitList = VisitList.builder() diff --git a/core-module/src/main/java/com/likelion/coremodule/store/domain/Store.java b/core-module/src/main/java/com/likelion/coremodule/store/domain/Store.java index 8151c9d..c68e9cf 100644 --- a/core-module/src/main/java/com/likelion/coremodule/store/domain/Store.java +++ b/core-module/src/main/java/com/likelion/coremodule/store/domain/Store.java @@ -6,7 +6,6 @@ @Builder @Getter -@Setter @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor @Entity diff --git a/core-module/src/main/java/com/likelion/coremodule/user/dto/LoginAddResponse.java b/core-module/src/main/java/com/likelion/coremodule/user/dto/LoginAddResponse.java new file mode 100644 index 0000000..f392257 --- /dev/null +++ b/core-module/src/main/java/com/likelion/coremodule/user/dto/LoginAddResponse.java @@ -0,0 +1,12 @@ +package com.likelion.coremodule.user.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record LoginAddResponse( + String nickname, + @Schema(description = "액세스 토큰", example = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QGdtYWlsLmNvbSIs", defaultValue = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QGdtYWlsLmNvbSIs") + String accessToken, + @Schema(description = "리프레시 토큰", example = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QGdtYWlsLmNvbSIs", defaultValue = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QGdtYWlsLmNvbSIs") + String refreshToken +) { +}