Merge pull request #56 from Nexters/dev

k906506 · web-flow · commit 9eaa1bbd876d · 2025-04-22T21:27:51.000+09:00
#49 디스코드 웹훅 연결
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'com.mysql:mysql-connector-j'
diff --git a/src/main/java/donmani/donmani_server/AppConfig.java b/src/main/java/donmani/donmani_server/AppConfig.java
@@ -0,0 +1,13 @@
+package donmani.donmani_server;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@Configuration
+public class AppConfig {
+	@Bean
+	public WebClient webClient(WebClient.Builder builder) {
+		return builder.build();
+	}
+}
diff --git a/src/main/java/donmani/donmani_server/expense/controller/ExpenseController.java b/src/main/java/donmani/donmani_server/expense/controller/ExpenseController.java
@@ -7,24 +7,20 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import donmani.donmani_server.common.httpStatus.HttpStatusDTO;
 import donmani.donmani_server.expense.service.ExpenseService;
-import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Map;
-
 @RestController
 @RequiredArgsConstructor
 public class ExpenseController {
 	private final ExpenseService expenseService;
 
 	@GetMapping("expenses/calendar/{userKey}")
-	public ResponseEntity<ExpenseResponseDTO> getExpensesCalendarV1(
+	public ResponseEntity<ExpenseResponseDTO> getExpensesCalendar(
 		@PathVariable String userKey,
 		@RequestParam int year,
 		@RequestParam int month) {
@@ -33,7 +29,7 @@ public ResponseEntity<ExpenseResponseDTO> getExpensesCalendarV1(
 	}
 
 	@GetMapping("api/v1/expenses/calendar/{userKey}")
-	public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesCalendarV2(
+	public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesCalendarV1(
 		@PathVariable String userKey,
 		@RequestParam int year,
 		@RequestParam int month) {
@@ -47,7 +43,7 @@ public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesCalendarV2(
 	}
 
 	@GetMapping("api/v1/expenses/list/{userKey}")
-	public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesListV2(
+	public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesListV1(
 		@PathVariable String userKey,
 		@RequestParam int year,
 		@RequestParam int month) {
@@ -61,7 +57,7 @@ public ResponseEntity<HttpStatusDTO<ExpenseResponseDTO>> getExpensesListV2(
 	}
 
 	@GetMapping("expenses/list/{userKey}")
-	public ResponseEntity<ExpenseResponseDTO> getExpensesListV1(
+	public ResponseEntity<ExpenseResponseDTO> getExpensesList(
 		@PathVariable String userKey,
 		@RequestParam int year,
 		@RequestParam int month) {
@@ -70,17 +66,22 @@ public ResponseEntity<ExpenseResponseDTO> getExpensesListV1(
 	}
 
 	@PostMapping("expenses")
-	public ResponseEntity<Void> addExpenseV1(@RequestBody ExpenseRequestDTO request) {
+	public ResponseEntity<Void> addExpense(@RequestBody ExpenseRequestDTO request) {
 		expenseService.addExpense(request);
 		return ResponseEntity.ok().build();
 	}
 
 	@PostMapping("api/v1/expenses")
-	public ResponseEntity<HttpStatusDTO<Void>> addExpenseV2(@RequestBody ExpenseRequestDTO request) {
-		expenseService.addExpense(request);
+	public ResponseEntity<HttpStatusDTO<Void>> addExpenseV1(@RequestBody ExpenseRequestDTO request) {
+		try {
+			expenseService.addExpense(request);
 
-		return ResponseEntity.ok(
-			HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", null));
+			// 1. 소비 기록 성공 -> 201
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", null));
+		} catch (Exception e) {
+			// 2. 소비 기록 실패 -> 500
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.INTERNAL_SERVER_ERROR.value(), "유저 정보 없음", null));
+		}
 	}
 
 	// 연도별 소비 기록 요약 조회
diff --git a/src/main/java/donmani/donmani_server/expense/entity/Expense.java b/src/main/java/donmani/donmani_server/expense/entity/Expense.java
@@ -18,7 +18,7 @@ public class Expense {
 
 	private Long userId;
 
-	private LocalDateTime createdAt;
+	private LocalDateTime createdAt; // 사용자가 기록하려는 일자 -> 어제 기록을 오늘 등록한 경우 어제일자로 들어감
 
 	@Enumerated(EnumType.STRING)
 	private CategoryType category;
@@ -27,4 +27,11 @@ public class Expense {
 	private FlagType flag;
 
 	private String memo;
+
+	/*
+	 - 2025.04.16
+	 - 생성일자, 최종변경일자 칼럼 추가
+	*/
+	private LocalDateTime createdDate; // 서버에 기록된 일자
+	private LocalDateTime updateDate;
 }
diff --git a/src/main/java/donmani/donmani_server/expense/service/ExpenseService.java b/src/main/java/donmani/donmani_server/expense/service/ExpenseService.java
@@ -33,6 +33,7 @@ public class ExpenseService {
 	@Transactional
 	public void addExpense(ExpenseRequestDTO request) {
 		Long userId = userService.getUserIdByUserKey(request.getUserKey());
+		LocalDateTime localDateTime = LocalDateTime.now();
 
 		List<Expense> expenses = request.getRecords().stream()
 			.flatMap(record -> {
@@ -45,13 +46,15 @@ public void addExpense(ExpenseRequestDTO request) {
 					return Stream.of(Expense.builder()
 						.userId(userId)
 						.createdAt(record.getDate().atStartOfDay())
+						.createdDate(localDateTime)
 						.build());
 				}
 
 				// 기록이 있을 때
 				return contents.stream().map(content -> Expense.builder()
 					.userId(userId)
 					.createdAt(record.getDate().atStartOfDay())
+					.createdDate(localDateTime)
 					.flag(content.getFlag())
 					.category(content.getCategory())
 					.memo(content.getMemo())
diff --git a/src/main/java/donmani/donmani_server/user/controller/UserController.java b/src/main/java/donmani/donmani_server/user/controller/UserController.java
@@ -2,11 +2,12 @@
 
 import donmani.donmani_server.common.httpStatus.HttpStatusDTO;
 import donmani.donmani_server.expense.dto.NoticeReadDTO;
+import donmani.donmani_server.user.dto.UpdateUserNoticeEnableRequestDTO;
 import donmani.donmani_server.user.dto.UpdateUsernameRequestDTO;
 import donmani.donmani_server.user.dto.UpdateUsernameResponseDTO;
 import donmani.donmani_server.user.dto.UserRegisterRequestDTO;
 import donmani.donmani_server.user.dto.UserRegisterResponseDTO;
-import donmani.donmani_server.user.dto.UserRegisterResponseDTOV2;
+import donmani.donmani_server.user.dto.UserRegisterResponseDTOV1;
 import donmani.donmani_server.user.service.UserService;
 
 import org.springframework.http.HttpStatus;
@@ -22,7 +23,7 @@ public class UserController {
 	private final UserService userService;
 
 	@PostMapping("users/register")
-	public ResponseEntity<UserRegisterResponseDTO> registerUserV1(
+	public ResponseEntity<UserRegisterResponseDTO> registerUser(
 		@Valid @RequestBody UserRegisterRequestDTO request) {
 
 		UserRegisterResponseDTO response = userService.registerUser(request.getUserKey());
@@ -31,31 +32,31 @@ public ResponseEntity<UserRegisterResponseDTO> registerUserV1(
 	}
 
 	@PostMapping("api/v1/user/register")
-	public ResponseEntity<HttpStatusDTO<UserRegisterResponseDTOV2>> registerUserV2(
+	public ResponseEntity<HttpStatusDTO<UserRegisterResponseDTOV1>> registerUserV1(
 		@Valid @RequestBody UserRegisterRequestDTO request) {
 
-		ResponseEntity<HttpStatusDTO<UserRegisterResponseDTOV2>> response;
+		ResponseEntity<HttpStatusDTO<UserRegisterResponseDTOV1>> response;
 
 		// 1. userId
-		long userId = userService.getUserIdByUserKeyV2(request.getUserKey());
+		long userId = userService.getUserIdByUserKeyV1(request.getUserKey());
 
 		// 2.1 신규 유저 -> 201
 		if (userId == -1L) {
-			UserRegisterResponseDTOV2 user = userService.registerUserV2(request.getUserKey());
+			UserRegisterResponseDTOV1 user = userService.registerUserV1(request.getUserKey());
 			response = ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "신규 유저", user));
 		}
 
 		// 2,2 기존 유저 -> 200
 		else {
-			UserRegisterResponseDTOV2 user = userService.registerUserV2(request.getUserKey());
+			UserRegisterResponseDTOV1 user = userService.registerUserV1(request.getUserKey());
 			response = ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.OK.value(), "기존 유저", user));
 		}
 
 		return response;
 	}
 
 	@PutMapping("users/update")
-	public ResponseEntity<UpdateUsernameResponseDTO> updateNicknameV1(
+	public ResponseEntity<UpdateUsernameResponseDTO> updateNickname(
 		@Valid @RequestBody UpdateUsernameRequestDTO request) {
 
 		UpdateUsernameResponseDTO response = userService.updateUsername(request.getUserKey(), request.getNewUserName());
@@ -64,7 +65,7 @@ public ResponseEntity<UpdateUsernameResponseDTO> updateNicknameV1(
 	}
 
 	@PostMapping("api/v1/user/update")
-	public ResponseEntity<HttpStatusDTO<UpdateUsernameResponseDTO>> updateNicknameV2(
+	public ResponseEntity<HttpStatusDTO<UpdateUsernameResponseDTO>> updateNicknameV1(
 		@Valid @RequestBody UpdateUsernameRequestDTO request) {
 		try {
 			UpdateUsernameResponseDTO user = userService.updateUsername(request.getUserKey(), request.getNewUserName());
@@ -89,4 +90,34 @@ public ResponseEntity<Void> markNoticeAsRead(@PathVariable String userKey) {
 		userService.markNoticeAsRead(userKey);
 		return ResponseEntity.ok().build();
 	}
+
+	@PutMapping("api/v1/notice/enable/{userKey}")
+	public ResponseEntity<HttpStatusDTO<UpdateUserNoticeEnableRequestDTO>> updateUserNoticeEnableV1(
+		@Valid @RequestBody UpdateUserNoticeEnableRequestDTO request) {
+		try {
+			userService.updateUserNoticeEnable(request.getUserKey(), request.isNoticeEnable());
+
+			// 1. 알림수신동의여부 변경 성공 -> 201
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", null));
+		} catch (IllegalArgumentException e) {
+			// 2. 알림수신동의여부 변경 실패 -> 500
+			return ResponseEntity.ok(
+				HttpStatusDTO.response(HttpStatus.INTERNAL_SERVER_ERROR.value(), "유저 정보 없음", null));
+		}
+	}
+
+	@PutMapping("api/v1/user/last-login/{userKey}")
+	public ResponseEntity<HttpStatusDTO<Void>> updateUserLastLoginDateV1(
+		@PathVariable String userKey) {
+		try {
+			userService.updateUserLastLoginDate(userKey);
+
+			// 1. 최종접속일자 변경 성공 -> 201
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", null));
+		} catch (IllegalArgumentException e) {
+			// 2. 최종접속일자 변경 실패 -> 500
+			return ResponseEntity.ok(
+				HttpStatusDTO.response(HttpStatus.INTERNAL_SERVER_ERROR.value(), "유저 정보 없음", null));
+		}
+	}
 }
diff --git a/src/main/java/donmani/donmani_server/user/dto/UpdateUserNoticeEnableRequestDTO.java b/src/main/java/donmani/donmani_server/user/dto/UpdateUserNoticeEnableRequestDTO.java
@@ -0,0 +1,13 @@
+package donmani.donmani_server.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateUserNoticeEnableRequestDTO {
+	private String userKey;
+	private boolean noticeEnable;
+}
diff --git a/src/main/java/donmani/donmani_server/user/dto/UserRegisterRequestDTO.java b/src/main/java/donmani/donmani_server/user/dto/UserRegisterRequestDTO.java
@@ -1,11 +1,13 @@
 package donmani.donmani_server.user.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 @Getter
-@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class UserRegisterRequestDTO {
 	@NotBlank(message = "Device ID가 존재하지 않습니다.")
 	private String userKey;
diff --git a/src/main/java/donmani/donmani_server/user/dto/UserRegisterResponseDTO.java b/src/main/java/donmani/donmani_server/user/dto/UserRegisterResponseDTO.java
@@ -2,11 +2,12 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@NoArgsConstructor
 @AllArgsConstructor
 public class UserRegisterResponseDTO {
-	// private boolean isNew;
 	private String userKey;
 	private String userName;
 }
diff --git a/src/main/java/donmani/donmani_server/user/dto/UserRegisterResponseDTOV1.java b/src/main/java/donmani/donmani_server/user/dto/UserRegisterResponseDTOV1.java
@@ -2,10 +2,12 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@NoArgsConstructor
 @AllArgsConstructor
-public class UserRegisterResponseDTOV2{
+public class UserRegisterResponseDTOV1 {
 	private boolean isNew;
 	private String userKey;
 	private String userName;
diff --git a/src/main/java/donmani/donmani_server/user/entity/User.java b/src/main/java/donmani/donmani_server/user/entity/User.java
@@ -1,5 +1,7 @@
 package donmani.donmani_server.user.entity;
 
+import java.time.LocalDateTime;
+
 import donmani.donmani_server.fcm.entity.FCMToken;
 import jakarta.persistence.*;
 import lombok.*;
@@ -28,6 +30,18 @@ public class User {
 
 	private boolean isNoticeRead;
 
+	/*
+	 - 2025.04.16
+	 - 생성일자, 최종변경일자, 최종접속일자, 알림수신여부 칼럼 추가
+	*/
+	private LocalDateTime createdDate;
+
+	private LocalDateTime updateDate;
+
+	private LocalDateTime lastLoginDate;
+
+	private boolean isNoticeEnable;
+
 	public static String generateRandomUsername() {
 		String[] adjectives = {"기쁜", "활발한", "멋있는", "즐거운", "당황한", "설레는", "귀여운", "뿌듯한", "시원한", "황홀한"};
 		String[] animals = {"고양이", "강아지", "호랑이", "사자", "여우", "늑대", "토끼", "다람쥐", "판다", "코끼리", "원숭이", "곰", "독수리", "올빼미", "수달", "두더지", "너구리", "하마", "피카츄"};
diff --git a/src/main/java/donmani/donmani_server/user/service/UserService.java b/src/main/java/donmani/donmani_server/user/service/UserService.java
diff --git a/src/main/java/donmani/donmani_server/webhook/controller/WebHookController.java b/src/main/java/donmani/donmani_server/webhook/controller/WebHookController.java
diff --git a/src/main/java/donmani/donmani_server/webhook/repository/WebHookRepository.java b/src/main/java/donmani/donmani_server/webhook/repository/WebHookRepository.java
diff --git a/src/main/java/donmani/donmani_server/webhook/service/WebHookService.java b/src/main/java/donmani/donmani_server/webhook/service/WebHookService.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
