COMMON: 7기 통합 온보딩 제출(v2)

v2/backend/greetingCard/.gitignore

@@ -36,4 +36,5 @@ out/
 
 ### VS Code ###
 .vscode/
-.env
+.env
+v2/backend/greetingCard/src/main/resources/application.properties

v2/backend/greetingCard/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application using Gradle Wrapper
-FROM openjdk:21-jdk-slim AS build
+FROM openjdk:17-jdk-slim AS build
 
 # Install dependencies for building
 RUN apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/*

v2/backend/greetingCard/build.gradle

@@ -10,7 +10,7 @@ sourceCompatibility = '17'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -39,6 +39,8 @@ dependencies {
     implementation 'com.amazonaws:aws-java-sdk-s3:1.11.1000'
     implementation 'org.mariadb.jdbc:mariadb-java-client'
 
+    // 테스트용 h2 database
+    runtimeOnly 'com.h2database:h2'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

v2/backend/greetingCard/docker-compose.yml

@@ -7,6 +7,8 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8080:8080"
+    env_file:
+      - .env
     environment:
       SPRING_DATASOURCE_URL: ${DB_URL}
       SPRING_DATASOURCE_USERNAME: ${DB_USERNAME}
@@ -22,6 +24,8 @@ services:
   db:
     image: mariadb:10.5
     restart: always
+    env_file:
+      - .env
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
       MYSQL_DATABASE: greetingdb

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/configuration/AWSConfig.java

@@ -12,7 +12,7 @@
 /**
  * 해당 파일은 수정하지 않아도 됩니다. 따봉 6기가 config를 작성해뒀다구!
  * <p>
- * 동작하지 않는다면 에러 로그를 확인하고 .env 파일을 제대로 넣었는지 확인해보세요!!
+ * 동작하지 않는다면 에러 로그를 확인하고 application.properties 파일을 제대로 넣었는지 확인해보세요!!
  */
 @Configuration
 public class AWSConfig {

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/dto/GroupSearchDto.java

@@ -0,0 +1,12 @@
+package com.cabi.greetingCard.dto;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class GroupSearchDto {
+
+	List<String> GroupNames;
+}

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/dto/MessageResponsePaginationDto.java

@@ -9,5 +9,6 @@
 public class MessageResponsePaginationDto {
 
 	private List<MessageResponseDto> messages;
-	private Long totalLength;
+	private int totalLength;
+	private int currentPage;
 }

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/exception/ExceptionController.java

@@ -15,7 +15,7 @@ public class ExceptionController {
 	@ExceptionHandler(GreetingException.class)
 	public ResponseEntity<?> serviceExceptionHandler(GreetingException e) {
 		return ResponseEntity
-				.status(e.status.getErrorCode())
+				.status(e.status.getHttpCode())
 				.body(e.status);
 	}
 }

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/exception/ExceptionStatus.java

@@ -11,23 +11,28 @@
 @Getter
 public enum ExceptionStatus {
 
-	NOT_FOUND_MESSAGE(HttpStatus.NOT_FOUND, "존재하지 않는 메세지입니다"),
-	UNAUTHORIZED_PASSWORD(HttpStatus.UNAUTHORIZED, "비밀번호가 일치하지 않습니다"),
-	DUPLICATED_NAME(HttpStatus.UNAUTHORIZED, "중복된 아이디입니다."),
-	INVALID_NAME(HttpStatus.BAD_REQUEST, "형식에 맞지 않는 아이디입니다."),
-	INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "형식에 맞지 않는 비밀번호입니다."),
-	NOT_FOUND_USER(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니디."),
-	INVALID_FORMAT_MESSAGE(HttpStatus.BAD_REQUEST, "잘못된 형식의 메세지입니다!"),
-	;
+	LOGIN_FAIL(HttpStatus.UNAUTHORIZED, "로그인에 실패했습니다.", "001"),
+	DUPLICATED_NAME(HttpStatus.UNAUTHORIZED, "중복된 아이디입니다.", "002"),
+	INVALID_NAME(HttpStatus.BAD_REQUEST, "형식에 맞지 않는 아이디입니다.", "003"),
+	INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "형식에 맞지 않는 비밀번호입니다.", "004"),
+	INVALID_GROUP_ACCESS(HttpStatus.BAD_REQUEST, "잘못된 접근입니다.", "005"),
+	INVALID_FORMAT_MESSAGE(HttpStatus.BAD_REQUEST, "잘못된 형식의 메세지입니다!", "007"),
+	NOT_FOUND_USER(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니디.", "008"),
+	INVALID_QUERYSTRING(HttpStatus.BAD_REQUEST, "잘못된 쿼리스트링입니다.", "009"),
+	UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "권한이 없습니다.", "010"),
+	NOT_FOUND_MESSAGE(HttpStatus.NOT_FOUND, "존재하지 않는 메세지입니다", "011"),
+	SENDER_EQUAL_RECEIVER(HttpStatus.BAD_REQUEST, "보내는 사람과 받는 사람이 같습니다.", "013");
 
-	private final int errorCode;
+	private final int httpCode;
 	private final String message;
 	private final String error;
+	private final String errorCode;
 
-	ExceptionStatus(HttpStatus status, String message) {
-		this.errorCode = status.value();
+	ExceptionStatus(HttpStatus status, String message, String errorCode) {
+		this.httpCode = status.value();
 		this.message = message;
 		this.error = status.getReasonPhrase();
+		this.errorCode = errorCode;
 	}
 
 	public GreetingException asGreetingException() {

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/message/controller/MessageController.java

@@ -8,19 +8,20 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/주요 리소스가 누구지..")
+@RequestMapping("/messages")
 @Slf4j
 public class MessageController {
 
@@ -36,7 +37,7 @@ public class MessageController {
 	 * @throws IOException
 	 */
 	@PostMapping("")
-	public void sendMessage(@CookieValue(name = "userName") String userName,
+	public void sendMessage(@CookieValue(name = "userName", required = false) String userName,
 			@ModelAttribute MessageRequestDto messageData) throws IOException {
 		messageService.sendMessage(userName, messageData);
 	}
@@ -46,46 +47,33 @@ public void sendMessage(@CookieValue(name = "userName") String userName,
 	 *
 	 * @param userName
 	 * @param pageable
+	 * @param category
 	 * @return
 	 */
 	@GetMapping("")
-	public MessageResponsePaginationDto getAllMessages(
+	public ResponseEntity<MessageResponsePaginationDto> getAllMessages(
 			@CookieValue(name = "userName") String userName,
-			Pageable pageable) {
-		return messageService.getEveryoneMessage(userName, pageable);
+			Pageable pageable,
+			int category) {
+		MessageResponsePaginationDto messages = messageService.getMessages(userName, pageable,
+				category);
+
+		return ResponseEntity.ok()
+				.body(messages);
 	}
 
 	/**
-	 * 모두에게 덕담 메세지 보내기
+	 * 메세지 내용을 수정합니다.
 	 *
 	 * @param userName
-	 * @param message
-	 * @throws IOException
+	 * @param messageId
+	 * @param requestDto
 	 */
-	@PostMapping("/test1")
-	public void postAllUsers(@CookieValue(name = "userName") String userName,
-			@ModelAttribute MessageRequestDto message) throws IOException {
-		messageService.sendMessage(userName, message);
-	}
-
-	@GetMapping("/test2")
-	public MessageResponsePaginationDto getReceivedMessages(
-			@CookieValue(name = "userName") String userName,
-			Pageable pageable) {
-		return messageService.getReceivedMessages(userName, pageable);
-	}
-
-	@GetMapping("/test3")
-	public MessageResponsePaginationDto getSentMessages(
-			@CookieValue(name = "userName") String userName,
-			Pageable pageable) {
-		return messageService.getSentMessages(userName, pageable);
-	}
-
-	@PatchMapping("/{test4}")
-	public void updateMessageContext(@CookieValue(name = "userName") String userName,
-			@PathVariable(name = "test?") Long messageId,
+	@PutMapping("/{messageId}")
+	public ResponseEntity<?> updateMessageContext(@CookieValue(name = "userName") String userName,
+			@PathVariable(name = "messageId") Long messageId,
 			@RequestBody RequestDto requestDto) {
 		messageService.updateMessageContext(userName, messageId, requestDto.getContext());
+		return ResponseEntity.ok().build();
 	}
 }

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/message/domain/Message.java

@@ -8,8 +8,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -66,5 +64,6 @@ private boolean isValid() {
 	}
 
 	public void updateContext(String context) {
+		this.context = context;
 	}
 }

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/message/domain/MessageCategory.java

@@ -0,0 +1,16 @@
+package com.cabi.greetingCard.message.domain;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum MessageCategory {
+
+	TO_EVERYONE("@everyone", 0),
+	TO_ME("to_me", 1),
+	FROM_ME("from_me", 2);
+
+	private final String name;
+	private final int number;
+}

v2/backend/greetingCard/src/main/java/com/cabi/greetingCard/message/repository/MessageRepository.java

@@ -1,10 +1,15 @@
 package com.cabi.greetingCard.message.repository;
 
 import com.cabi.greetingCard.message.domain.Message;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface MessageRepository extends JpaRepository<Message, Long> {
 
+	Page<Message> findAllByReceiverName(String receiverName, Pageable pageable);
+
+	Page<Message> findAllBySenderName(String name, Pageable pageable);
 }