Merge conflict resolved

Author: seoyeonson

.github/workflows/deploy.yml

@@ -76,7 +76,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          instance-ids: "i-0e27758b937bcc047"
+          instance-ids: "i-050af13cf2c3bc98a"
           working-directory: /
           comment: Deploy
           command: |

build.gradle.kts

@@ -76,6 +76,9 @@ 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
+
+	implementation("org.springframework.boot:spring-boot-starter-actuator")
+
 }
 
 tasks.withType<Test> {

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

@@ -7,12 +7,10 @@
 
 @SpringBootApplication
 @EnableJpaAuditing
-// 스케쥴링 활성화
-// 테스트시에만 주석 풀기
 @EnableScheduling
-public class CommitFieldApplication {
+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 {
+
+}

…in/controller/ApiV1PetImgController.java …in/controller/ApiV1PetImgController.javasrc/main/java/cmf/commitField/domain/admin/controller/ApiV1PetImgController.java renamed to src/main/java/cmf/commitField/domain/admin/admin/controller/ApiV1PetImgController.java src/main/java/cmf/commitField/domain/admin/controller/ApiV1PetImgController.java renamed to src/main/java/cmf/commitField/domain/admin/admin/controller/ApiV1PetImgController.java

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.admin.controller;
+package cmf.commitField.domain.admin.admin.controller;
 
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;