Refactor/user problem number

src/main/java/org/ezcode/codetest/application/usermanagement/user/service/UserService.java

@@ -1,5 +1,6 @@
 package org.ezcode.codetest.application.usermanagement.user.service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -56,14 +57,18 @@ public class UserService {
 	private final RedisTemplate<String, String> redisTemplate;
 	private final S3Uploader s3Uploader;
 
-	@Transactional(readOnly = true)
+	@Transactional
 	public UserInfoResponse getUserInfo(AuthUser authUser) {
 		log.info("authUserEmail: {}, authUserID : {}", authUser.getEmail(), authUser.getId());
 		User user = userDomainService.getUserById(authUser.getId());
 		int userSubmissionCount = submissionDomainService.findSubmissionCountByUserId(user.getId());
 		List<UserAuthType> userAuthTypes = userDomainService.getUserAuthTypesByUser(user);
 		List<AuthType> authTypes = userAuthTypes.stream()
 			.map(UserAuthType::getAuthType).toList();
+		if (user.getLanguage() == null) {
+			Language userLanguage = languageDomainService.getLanguage(1L);
+			user.setLanguage(userLanguage);
+		}
 
 		return UserInfoResponse.builder()
 			.username(user.getUsername())
@@ -87,6 +92,12 @@ public UserInfoResponse getUserInfo(AuthUser authUser) {
 	public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest request, MultipartFile image) {
 		User user = userDomainService.getUserById(authUser.getId());
 		Language findLangauge = languageDomainService.getLanguage(request.languageId());
+		if (request.nickname() != null && !request.nickname().equals(user.getNickname())) {
+			if (userDomainService.existsByNickname(request.nickname())) {
+				log.info("중복 닉네임");
+				throw new UserException(UserExceptionCode.ALREADY_EXIST_NICKNAME);
+			}
+		}
 
 		user.modifyUserInfo(
 			request.nickname(),

src/main/java/org/ezcode/codetest/domain/submission/dto/DailyCorrectCount.java

@@ -1,12 +1,21 @@
 package org.ezcode.codetest.domain.submission.dto;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 public record DailyCorrectCount(
     LocalDate date,
-    int count
+    int count,
+    List<Long> problemIds
 ) {
-    public DailyCorrectCount(java.sql.Date date, int count) {
-        this(date.toLocalDate(), count);
+
+    public DailyCorrectCount(java.sql.Date date, Set<Long> problemIds) {
+        this(
+            date.toLocalDate(),
+            problemIds.size(),
+            new ArrayList<>(problemIds)
+        );
     }
 }

src/main/java/org/ezcode/codetest/domain/submission/service/SubmissionDomainService.java

@@ -1,5 +1,6 @@
 package org.ezcode.codetest.domain.submission.service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -120,4 +121,5 @@ private void modifyUserProblemResult(UserProblemResult userProblemResult, boolea
     public int findSubmissionCountByUserId(Long userId) {
         return submissionRepository.findSubmissionCountByUserId(userId);
     }
+
 }

src/main/java/org/ezcode/codetest/domain/user/exception/code/UserExceptionCode.java

@@ -15,8 +15,7 @@ public enum UserExceptionCode implements ResponseCode {
 	NO_GITHUB_INFO(false, HttpStatus.BAD_REQUEST, "깃허브 정보가 없습니다."),
 	NO_GITHUB_REPO(false, HttpStatus.BAD_REQUEST, "해당하는 Repository를 찾을 수 없습니다."),
 
-
-	;
+    ALREADY_EXIST_NICKNAME(false, HttpStatus.BAD_REQUEST, "이미 존재하는 닉네임입니다");
 	private final boolean success;
 	private final HttpStatus status;
 	private final String message;

src/main/java/org/ezcode/codetest/domain/user/model/entity/User.java

@@ -216,4 +216,8 @@ public void modifyProfileImage(String profileImageUrl) {
 	public void modifyUserRole(UserRole userRole) {
 		this.role = userRole;
 	}
+
+	public void setLanguage(Language userLanguage) {
+		this.language = userLanguage;
+	}
 }

src/main/java/org/ezcode/codetest/domain/user/repository/UserRepository.java

@@ -22,4 +22,5 @@ public interface UserRepository {
 
 	void updateUserGithubAccessToken(User loginUser);
 
+	List<String> getUserNicknames();
 }

src/main/java/org/ezcode/codetest/domain/user/service/MailService.java

@@ -51,7 +51,7 @@ public MimeMessage CreateButtonMail(Long userId, String email, String redirectUr
 			String body = "";
 			body += "<h3>" + "아래 버튼을 클릭하여 이메일 인증을 완료해 주세요" + "</h3>";
 			// 이메일 버튼
-			body += "<a href='" + redirectUrl + "/api/auth/verify?email="+ email + "&key=" + key + "' target='_blenk'>이메일 인증 확인</a>";
+			body += "<a href='" + redirectUrl + "/api/auth/verify-page?email="+ email + "&key=" + key + "' target='_blenk'>이메일 인증 확인</a>";
 			body += "<h3>" + "감사합니다." + "</h3>";
 			message.setText(body,"UTF-8", "html");
 		} catch (MessagingException e) {

src/main/java/org/ezcode/codetest/domain/user/service/UserDomainService.java

@@ -132,4 +132,11 @@ public List<UserAuthType> getUserAuthTypesByUser(User user) {
 		return userAuthTypeRepository.getUserAuthTypesByUser(user);
 	}
 
+    public List<String> getUserNicknames() {
+		return userRepository.getUserNicknames();
+    }
+
+    public boolean existsByNickname(String nickname) {
+		return userRepository.existsByNickname(nickname);
+    }
 }

src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/submission/query/UserProblemResultQueryRepositoryImpl.java

@@ -7,6 +7,7 @@
 import org.ezcode.codetest.domain.submission.model.entity.QUserProblemResult;
 import org.springframework.stereotype.Repository;
 
+import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -27,17 +28,20 @@ public List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId) {
         var date = Expressions.dateTemplate(java.sql.Date.class, "DATE({0})", upr.modifiedAt);
 
         return queryFactory
-            .select(Projections.constructor(DailyCorrectCount.class,
-                date,
-                upr.count().intValue()
-            ))
             .from(upr)
             .where(
                 upr.user.id.eq(userId),
                 upr.isCorrect.eq(true)
             )
-            .groupBy(date)
             .orderBy(date.asc())
-            .fetch();
+            .transform(
+                GroupBy.groupBy(date).list(
+                    Projections.constructor(
+                        DailyCorrectCount.class,
+                        date,
+                        GroupBy.set(upr.problem.id)
+                    )
+                )
+            );
     }
 }

src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/user/UserJpaRepository.java

@@ -24,4 +24,7 @@ void updateReviewTokens(
 		@Param("ids") List<Long> ids,
 		@Param("newToken") int newToken
 	);
+
+	@Query("select u.nickname from User u ")
+	List<String> findAllNicknames();
 }

src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/user/UserRepositoryImpl.java

@@ -53,6 +53,9 @@ public void updateUserGithubAccessToken(User loginUser) {
 		userJpaRepository.save(loginUser);
 	}
 
-
+	@Override
+	public List<String> getUserNicknames() {
+		return userJpaRepository.findAllNicknames();
+	}
 
 }

src/main/java/org/ezcode/codetest/presentation/usermanagement/UserController.java

@@ -13,6 +13,7 @@
 import org.ezcode.codetest.application.usermanagement.user.service.UserService;
 import org.ezcode.codetest.domain.user.model.entity.AuthUser;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -46,7 +47,7 @@ public ResponseEntity<UserInfoResponse> getUserInfo(@AuthenticationPrincipal Aut
 	}
 
 	@Operation(summary = "내 정보 수정", description = "닉네임, 블로그, 깃허브, 소개 등 개인 정보를 추가하거나 수정합니다.")
-    @PutMapping("/users")
+    @PutMapping(value = "/users", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 	public ResponseEntity<UserInfoResponse> modifyUserInfo(
 		@AuthenticationPrincipal AuthUser authUser,
 		@Valid @RequestPart("request") ModifyUserInfoRequest request,
@@ -90,6 +91,7 @@ public ResponseEntity<UserReviewTokenResponse> getReviewToken(
 		return ResponseEntity.status(HttpStatus.OK).body(userService.getReviewToken(authUser));
 	}
 
+	@Operation(summary = "회원의 푼 문제 수 조회", description = "날짜, 날짜마다 푼 문제 번호 리스트, 푼 문제 개수")
 	@GetMapping("/users/daily-solved")
 	public ResponseEntity<UserDailySolvedHistoryResponse> getUserDailySolvedHistory(
 		@AuthenticationPrincipal AuthUser authUser

src/main/java/org/ezcode/codetest/presentation/usermanagement/UserVerifyController.java

@@ -1,5 +1,7 @@
 package org.ezcode.codetest.presentation.usermanagement;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
 import org.ezcode.codetest.application.usermanagement.auth.dto.request.FindPasswordRequest;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ResetPasswordRequest;
 import org.ezcode.codetest.application.usermanagement.auth.dto.request.SendEmailRequest;
@@ -34,6 +36,12 @@
 public class UserVerifyController {
     private final AuthService authService;
 
+    @Value("${app.redirect.verify.success:/}")
+    private String verifySuccessRedirect;
+
+    @Value("${app.redirect.verify.failure:/}")
+    private String verifyFailureRedirect;
+
     @Operation(summary = "이메일 인증 코드 전송", description = "현재 로그인된 회원의 이메일로 인증 코드를 전송합니다.")
     @PostMapping("/email/send")
     public ResponseEntity<SendEmailResponse> sendMailCode(
@@ -53,6 +61,24 @@ public ResponseEntity<VerifyEmailCodeResponse> verifyEmailCode(
         return ResponseEntity.status(HttpStatus.OK).body(authService.verifyEmailCode(email, key));
     }
 
+    @Operation(summary = "이메일 코드 인증 후 페이지 리다이렉트", description = "이메일의 '인증하기' 버튼 클릭 시 성공/실패 페이지로 리다이렉트합니다.")
+    @GetMapping("/auth/verify-page")
+    public ResponseEntity<Void> verifyEmailCodeAndRedirect(
+        @RequestParam String email,
+        @RequestParam String key
+    ){
+        try {
+            authService.verifyEmailCode(email, key);
+            return ResponseEntity.status(HttpStatus.FOUND)
+                .header(HttpHeaders.LOCATION, verifySuccessRedirect)
+                .build();
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.FOUND)
+                .header(HttpHeaders.LOCATION, verifyFailureRedirect)
+                .build();
+        }
+    }
+
 
     //비밀번호 찾기 요청
     @Operation(summary = "비밀번호 찾기 요청", description = "비밀번호를 찾기 위해 이메일로 인증코드를 전송합니다.")

src/main/resources/application.properties

@@ -159,4 +159,12 @@ spring.datasource.hikari.minimum-idle=10
 spring.datasource.hikari.idle-timeout=30000
 spring.datasource.hikari.max-lifetime=600000
 spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.validation-timeout=5000
+spring.datasource.hikari.validation-timeout=5000
+
+# ========================
+# App Redirects (Email Verify)
+# ========================
+# 인증 성공 시 이동할 페이지 URL (예: 프론트의 성공 안내 페이지)
+app.redirect.verify.success=${APP_REDIRECT_VERIFY_SUCCESS:https://your-frontend.example.com/verify/success}
+# 인증 실패 시 이동할 페이지 URL (예: 프론트의 실패 안내 페이지)
+app.redirect.verify.failure=${APP_REDIRECT_VERIFY_FAILURE:https://your-frontend.example.com/verify/failure}