Merge pull request #111 from CommitField/dev

dev merge to main

Author: whale22

.gitignore

@@ -75,6 +75,9 @@ docker-compose.yaml
 
 ### db파일
 db/
+.docker
+data/
+.dummy
 
 ### secret 프로필
 application-secret.yml

build.gradle.kts

@@ -40,17 +40,16 @@ dependencies {
 	compileOnly("org.projectlombok:lombok")
 	annotationProcessor("org.projectlombok:lombok")
 
-	// DB
+	//DB
 	runtimeOnly("com.h2database:h2")
 	runtimeOnly("com.mysql:mysql-connector-j")
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 
-	// redis
+	//redis
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
-	implementation("org.springframework.session:spring-session-data-redis")
+	implementation ("org.redisson:redisson-spring-boot-starter:3.42.0") // redis message broker(lock)
+	implementation ("org.springframework.session:spring-session-data-redis")
 
-	// actuator
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
 
 	// Security
 	implementation("org.springframework.boot:spring-boot-starter-security")
@@ -59,10 +58,7 @@ dependencies {
 
 	//Swagger
 	implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")
-
-	//Web Socket
 	implementation("org.java-websocket:Java-WebSocket:1.5.2")
-	implementation ("org.springframework:spring-messaging")
 
 	// JWT
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")
@@ -80,7 +76,6 @@ dependencies {
 	// Spring Security OAuth2
 	implementation ("org.springframework.security:spring-security-oauth2-client:6.4.2") // Or the version you're using
 	implementation ("org.springframework.security:spring-security-oauth2-core:6.4.2") // Or the version you're using
-
 }
 
 tasks.withType<Test> {

src/main/java/cmf/commitField/CommitFieldApplication.java

@@ -3,13 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 public class CommitFieldApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(CommitFieldApplication.class, args);
 	}
-
 }

src/main/java/cmf/commitField/domain/File/service/FileProperties.java

@@ -0,0 +1,19 @@
+package cmf.commitField.domain.File.service;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+//@Configuration
+@Component
+@ConfigurationProperties(prefix = "custom.file")
+public class FileProperties {
+    private String uploadDir;
+
+    public String getUploadDir() {
+        return uploadDir;
+    }
+
+    public void setUploadDir(String uploadDir) {
+        this.uploadDir = uploadDir;
+    }
+}

src/main/java/cmf/commitField/domain/File/service/FileService.java

@@ -0,0 +1,36 @@
+package cmf.commitField.domain.File.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+@Service
+public class FileService {
+
+    // resources/static/uploads 폴더 경로
+    private final String UPLOAD_DIR = "src/main/resources/static/uploads";  // 상대 경로
+
+    // 파일 저장 메소드
+    public String saveFile(MultipartFile file) throws IOException {
+        // 파일 이름을 유니크하게 생성
+        String filename = System.currentTimeMillis() + "_" + file.getOriginalFilename();
+
+        // 파일 경로 생성
+        Path path = Paths.get(UPLOAD_DIR, filename);  // static/uploads 폴더에 저장
+
+        // 디렉토리가 존재하지 않으면 생성
+        Files.createDirectories(path.getParent());
+
+        // 파일 저장
+        Files.copy(file.getInputStream(), path, StandardCopyOption.REPLACE_EXISTING);
+
+        // 저장된 파일의 URL 반환 (웹에서 접근할 수 있는 경로)
+        return "/uploads/" + filename;  // 클라이언트가 접근할 수 있는 URL 반환
+    }
+}
+

src/main/java/cmf/commitField/domain/Timer/controller/TimerController.java

@@ -0,0 +1,7 @@
+package cmf.commitField.domain.Timer.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TimerController {
+}

src/main/java/cmf/commitField/domain/Timer/dto/TimerDto.java

@@ -0,0 +1,14 @@
+package cmf.commitField.domain.Timer.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class TimerDto {
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+}

src/main/java/cmf/commitField/domain/Timer/entity/Timer.java

@@ -0,0 +1,33 @@
+package cmf.commitField.domain.Timer.entity;
+
+import cmf.commitField.domain.user.entity.User;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Timer {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private User user;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+
+    // 타이머 종료 메서드
+    public void stop(LocalDateTime endTime, String totalTime) {
+        this.endTime = endTime;
+        this.totalTime = totalTime;
+    }
+}

src/main/java/cmf/commitField/domain/Timer/service/TimerService.java

@@ -0,0 +1,8 @@
+package cmf.commitField.domain.Timer.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class TimerService {
+
+}

src/main/java/cmf/commitField/domain/admin/controller/ApiV1PetImgController.java

@@ -12,7 +12,7 @@
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("/api/v1/admin/pet")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 public class ApiV1PetImgController {
     private final S3Client s3Client;

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/ChatController.java

@@ -0,0 +1,71 @@
+package cmf.commitField.domain.chat.chatMessage.controller;
+
+import cmf.commitField.domain.chat.chatMessage.controller.request.ChatMsgRequest;
+import cmf.commitField.domain.chat.chatMessage.controller.response.ChatMsgResponse;
+import cmf.commitField.domain.chat.chatMessage.dto.ChatMsgDto;
+import cmf.commitField.domain.chat.chatMessage.service.ChatMessageService;
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.global.error.ErrorCode;
+import cmf.commitField.global.globalDto.GlobalResponse;
+import cmf.commitField.global.security.LoginCheck;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/chat")
+public class ChatMessageController {
+
+    private final ChatMessageService chatMessageService;
+
+    @PostMapping("/msg/{roomId}")
+    @LoginCheck
+    public GlobalResponse<Object> sendChat(
+            @PathVariable Long roomId,
+            @RequestBody @Valid ChatMsgRequest message) {
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (!(authentication instanceof OAuth2AuthenticationToken)) {
+            return GlobalResponse.error(ErrorCode.NOT_AUTHENTICATED);
+        }
+
+        CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+        Long userId = principal.getId(); // OAuth2 로그인한 유저의 ID 가져오기
+
+        if (message == null || message.getMessage().trim().isEmpty()) {
+            return GlobalResponse.error(ErrorCode.EMPTY_MESSAGE);
+        }
+
+        ChatMsgResponse response = chatMessageService.sendMessage(message, userId, roomId);
+        return GlobalResponse.success("채팅 메시지 보내기 성공", response);
+    }
+
+    @GetMapping("/msg/{roomId}")
+    @LoginCheck
+    public GlobalResponse<Object> getChatList(
+            @PathVariable Long roomId,
+            @RequestParam(required = false) Long lastId) {
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (!(authentication instanceof OAuth2AuthenticationToken)) {
+            return GlobalResponse.error(ErrorCode.NOT_AUTHENTICATED);
+        }
+
+        CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+        Long userId = principal.getId(); // OAuth2 로그인한 유저의 ID 가져오기
+
+        List<ChatMsgDto> roomChatMsgList = chatMessageService.getRoomChatMsgList(roomId, userId, lastId);
+        if (roomChatMsgList == null || roomChatMsgList.isEmpty()) {
+            return GlobalResponse.error(ErrorCode.CHAT_NOT_FOUND);
+        }
+
+        return GlobalResponse.success("해당 채팅방의 메시지들을 조회하였습니다.", roomChatMsgList);
+    }
+}
+

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/ChatMessageController.java

@@ -0,0 +1,17 @@
+package cmf.commitField.domain.chat.chatMessage.controller.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChatMsgRequest {
+    @NotEmpty
+    @Length(max = 300)
+    private String message;
+
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/request/ChatMsgRequest.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.chat.chatMessage.controller.response;
+
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ChatMsgResponse {
+    private Long roomId;
+    //사용자(user)
+    private String from;
+    private String message;
+    private LocalDateTime sendAt;
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/controller/response/ChatMsgResponse.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.chat.chatMessage.dto;
+
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ChatMsgDto {
+    private Long chatMsgId;
+    private Long userId;
+    private String nickname;
+    private String message;
+    private LocalDateTime sendAt;
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/dto/ChatMsgDto.java

@@ -16,7 +16,7 @@
 @Setter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
-public class ChatMessage extends BaseEntity {
+public class ChatMsg extends BaseEntity {
 
     private String message;