Merge pull request #22 from ecolink-JOIN/feature/term

[Feat] 약관 조회 API 추가

src/main/java/com/join/core/auth/controller/TermController.java

@@ -0,0 +1,38 @@
+package com.join.core.auth.controller;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.join.core.auth.domain.TermInfo;
+import com.join.core.auth.domain.UserPrincipal;
+import com.join.core.auth.service.TermService;
+import com.join.core.common.response.ApiResponse;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("${api.prefix}")
+public class TermController {
+
+	private final TermService termService;
+
+	@Tag(name = "${swagger.tag.sign-up}")
+	@Operation(summary = "약관 조회 API - 인증 필요",
+		description = "약관 조회 API - 현재 유저의 동의가 필요한 약관을 조회하는 API입니다.",
+		security = {@SecurityRequirement(name = "session-token")})
+	@PreAuthorize("isAuthenticated()")
+	@GetMapping("/terms")
+	public ApiResponse<List<TermInfo.Main>> get(@AuthenticationPrincipal UserPrincipal principal) {
+		return ApiResponse.ok(termService.getRequiredConsentTerms(principal.getUserId()));
+	}
+
+}

src/main/java/com/join/core/auth/domain/AuthenticationToken.java

@@ -11,6 +11,7 @@ public class AuthenticationToken extends AbstractAuthenticationToken {
 
 	private AuthenticationToken(UserPrincipal principal, Collection<? extends GrantedAuthority> authorities) {
 		super(authorities);
+		super.setAuthenticated(true);
 		this.principal = principal;
 	}
 

src/main/java/com/join/core/auth/domain/Term.java

@@ -1,7 +1,7 @@
 package com.join.core.auth.domain;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 import com.join.core.common.domain.BaseTimeEntity;
 
@@ -23,7 +23,7 @@
 public class Term extends BaseTimeEntity {
 
 	@EmbeddedId
-	private Key id;
+	private Key key;
 
 	@Getter
 	@NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -45,7 +45,7 @@ public static class Key implements Serializable {
 	@Getter
 	@RequiredArgsConstructor
 	public enum Type {
-		REQUIRED("필수"), OPTIONAL("선택"), INACTIVE("종료");
+		REQUIRED("필수"), OPTIONAL("선택");
 
 		private final String description;
 	}
@@ -59,9 +59,9 @@ public enum Type {
 	private String content;
 
 	@NotNull
-	private LocalDateTime startDate;
+	private LocalDate startDate;
 
 	@NotNull
-	private LocalDateTime endDate;
+	private LocalDate endDate;
 
 }

src/main/java/com/join/core/auth/domain/TermInfo.java

@@ -0,0 +1,21 @@
+package com.join.core.auth.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+
+public class TermInfo {
+
+	private TermInfo() {
+	}
+
+	@Builder
+	@Getter
+	public static class Main {
+		private final Long id;
+		private final String version;
+		private final String title;
+		private final String content;
+		private final Term.Type type;
+	}
+
+}

src/main/java/com/join/core/auth/domain/TermInfoMapper.java

@@ -0,0 +1,19 @@
+package com.join.core.auth.domain;
+
+import org.mapstruct.InjectionStrategy;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(
+	componentModel = "spring",
+	injectionStrategy = InjectionStrategy.CONSTRUCTOR,
+	unmappedTargetPolicy = ReportingPolicy.ERROR
+)
+public interface TermInfoMapper {
+
+	@Mapping(source = "term.key.id", target = "id")
+	@Mapping(source = "term.key.version", target = "version")
+	TermInfo.Main of(Term term);
+
+}

src/main/java/com/join/core/auth/domain/UserInfo.java

@@ -5,7 +5,6 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 import com.join.core.auth.constant.UserType;
-import com.join.core.avatar.domain.Avatar;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -16,7 +15,6 @@ public class UserInfo {
 	private UserInfo() {
 	}
 
-
 	@Builder
 	@Getter
 	@ToString

src/main/java/com/join/core/auth/repository/TermReaderImpl.java

@@ -0,0 +1,28 @@
+package com.join.core.auth.repository;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.join.core.auth.domain.Term;
+import com.join.core.auth.domain.TermInfo;
+import com.join.core.auth.domain.TermInfoMapper;
+import com.join.core.auth.service.TermReader;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Component
+public class TermReaderImpl implements TermReader {
+
+	private final TermRepository termRepository;
+	private final TermInfoMapper termInfoMapper;
+
+	@Override
+	public List<TermInfo.Main> getRequiredConsentTerms(Long userId) {
+		List<Term> terms = termRepository.findRequiredConsentWith(userId);
+		return terms.stream().map(termInfoMapper::of).toList();
+	}
+}

src/main/java/com/join/core/auth/repository/TermRepository.java

@@ -0,0 +1,18 @@
+package com.join.core.auth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import com.join.core.auth.domain.Term;
+
+public interface TermRepository extends JpaRepository<Term, Term.Key> {
+	@Query("select t from Term t"
+		   + " left join TermAgreeHistory ta"
+		   + " on t = ta.term and ta.user.id = :userId"
+		   + " where CURRENT_DATE between t.startDate and t.endDate"
+		   + " and ta is null")
+	List<Term> findRequiredConsentWith(@Param("userId") Long userId);
+}

src/main/java/com/join/core/auth/service/TermReader.java

@@ -0,0 +1,11 @@
+package com.join.core.auth.service;
+
+import java.util.List;
+
+import com.join.core.auth.domain.TermInfo;
+
+public interface TermReader {
+
+	List<TermInfo.Main> getRequiredConsentTerms(Long userId);
+
+}

src/main/java/com/join/core/auth/service/TermService.java

@@ -0,0 +1,23 @@
+package com.join.core.auth.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.join.core.auth.domain.TermInfo;
+
+import lombok.RequiredArgsConstructor;
+
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+@Service
+public class TermService {
+
+	private final TermReader termReader;
+
+	public List<TermInfo.Main> getRequiredConsentTerms(Long userId) {
+		return termReader.getRequiredConsentTerms(userId);
+	}
+
+}