merge to main

.github/workflows/deploy.yaml

@@ -1,82 +0,0 @@
-name: Deploy to Elastic Beanstalk
-
-on:
-  push:
-    branches:
-      - main
-      - feat/backend-operation
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    env:
-      AWS_REGION: ap-northeast-2
-      APPLICATION_NAME: "motive-backend"
-      ENVIRONMENT_NAME: "Motive-backend-env"
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Ensure Docker Compose is available
-        run: |
-          docker --version
-          docker compose version
-
-      - name: Build Docker images
-        run: docker compose build
-
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'corretto'
-
-      - name: Set executable permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Install Elastic Beanstalk CLI
-        run: |
-          sudo apt update
-          sudo apt install -y python3-pip
-          pip install awsebcli --upgrade
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v3
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
-          aws-region: ${{ env.AWS_REGION }}
-
-      - name: Set Environment Variables
-        run: |
-          export SPRING_APP_NAME=${{ secrets.SPRING_APP_NAME }}
-          export DATABASE_URL=${{ secrets.DATABASE_URL }}
-          export MARIA_DATABASE_PORT=${{ secrets.MARIA_DATABASE_PORT }}
-          export MARIA_DATABASE_NAME=${{ secrets.MARIA_DATABASE_NAME }}
-          export DB_USERNAME=${{ secrets.DB_USERNAME }}
-          export DB_PASSWORD=${{ secrets.DB_PASSWORD }}
-          export REDIS_HOST=${{ secrets.REDIS_HOST }}
-          export REDIS_PORT=${{ secrets.REDIS_PORT }}
-          export SPRING_PROFILES_ACTIVE=${{ secrets.SPRING_PROFILES_ACTIVE }}
-          export SECRET_KEY=${{ secrets.SECRET_KEY }}
-          export JWT_SECRET_DEFAULT_VALUE=${{ secrets.JWT_SECRET_DEFAULT_VALUE }}
-          export JWT_HEADER=${{ secrets.JWT_HEADER }}
-
-      # Gradle 빌드
-      - name: Build and package the application
-        run: ./gradlew clean build -x test
-
-
-
-      # Elastic Beanstalk 배포
-      - name: Deploy to Elastic Beanstalk
-        run: |
-          eb init -p "Docker" ${{ env.APPLICATION_NAME }} --region ${{ env.AWS_REGION }}
-          eb use ${{ env.ENVIRONMENT_NAME }}
-          eb deploy --staged

Dockerfile

@@ -1,30 +0,0 @@
-# 단계 1: 빌드 단계 (Gradle 빌드)
-FROM openjdk:17-jdk-slim AS build
-WORKDIR /app
-
-# 필요한 파일 복사
-COPY gradlew ./gradlew
-COPY gradle/ ./gradle
-COPY build.gradle settings.gradle ./
-
-# gradlew 실행 권한 추가 및 의존성 설치
-RUN chmod +x gradlew
-RUN ./gradlew dependencies --no-daemon
-
-# 소스 코드 복사 및 빌드
-COPY . .
-RUN ./gradlew clean build -x test --no-daemon
-
-RUN ls -la build/libs
-
-# 단계 2: 실행 단계 (빌드된 JAR 파일 실행)
-FROM openjdk:17-jdk-slim
-WORKDIR /app
-
-COPY --from=build /app/build/libs/*.jar app.jar
-
-# 포트 노출
-EXPOSE 8081
-
-# JAR 파일 실행
-ENTRYPOINT ["java", "-jar", "app.jar",  "--server.port=8081"]

README.md

@@ -1,3 +1,6 @@
 # Final_Backend
 파이널 백엔드 프로젝트
-http://localhost:7777/swagger-ui/index.html
+<br>
+http://localhost:8080/swagger-ui/index.html
+<br>
+http://motive-backend-env.eba-n6hhmwaa.ap-northeast-2.elasticbeanstalk.com/swagger-ui/index.html

build.gradle

@@ -23,12 +23,15 @@ repositories {
     mavenCentral()
 }
 
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.3'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.3'
     compileOnly 'org.projectlombok:lombok'
@@ -43,6 +46,8 @@ dependencies {
 
     //swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+
+    // modelmapper
     implementation 'org.modelmapper:modelmapper:3.2.0'
 
     // jwt 토큰 라이브러리 추가
@@ -53,9 +58,23 @@ dependencies {
     // redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
+    //cache
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+
     //hibernate core
     implementation 'org.hibernate.orm:hibernate-core:6.5.2.Final'
 
+    // excel을 위한 poi 라이브러리
+    implementation 'org.apache.poi:poi-ooxml:5.2.2'
+    implementation 'org.apache.poi:poi:5.2.2'
+
+    // S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+    // SMTP
+    implementation 'org.springframework.boot:spring-boot-starter-mail'
+    implementation 'ognl:ognl:3.2.20'
+
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -1,29 +0,0 @@
-version: '3.8'
-
-services:
-  backend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: backend
-    environment:
-      - SPRING_PROFILES_ACTIVE=prod
-    expose:
-      - "8081"
-    networks:
-      - app-network
-
-  nginx:
-    build:
-      context: ./nginx
-      dockerfile: Dockerfile
-    container_name: nginx
-    depends_on:
-      - backend
-    ports:
-      - "80:80"  # Nginx가 8080 포트로 내부 백엔드에 접근
-    networks:
-      - app-network
-networks:
-  app-network:
-    driver: bridge

nginx/Dockerfile

@@ -1,5 +0,0 @@
-FROM nginx:alpine
-
-# Nginx 설정 파일 복사
-COPY default.conf /etc/nginx/conf.d/default.conf
-RUN ls -la /etc/nginx/conf.d/  # 설정 파일 복사 확인

nginx/default.conf

@@ -1,18 +0,0 @@
-upstream backend {
-    server backend:8081;  # 백엔드 컨테이너의 포트를 8080으로 수정
-}
-
-server {
-    listen 80;
-
-    location / {
-        proxy_pass http://backend;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "keep-alive";
-        proxy_cache_bypass $http_upgrade;
-    }
-}

src/main/java/stanl_2/final_backend/FinalBackendApplication.java

@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 public class FinalBackendApplication {
 

src/main/java/stanl_2/final_backend/domain/A_sample/command/application/controller/SampleController.java

@@ -5,15 +5,19 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import stanl_2.final_backend.domain.A_sample.command.application.dto.request.SampleRegistRequestDTO;
-import stanl_2.final_backend.domain.A_sample.command.application.dto.request.SampleModifyRequestDTO;
-import stanl_2.final_backend.domain.A_sample.command.application.dto.response.SampleModifyResponseDTO;
+import org.springframework.web.multipart.MultipartFile;
+import stanl_2.final_backend.domain.A_sample.command.application.dto.SampleRegistDTO;
+import stanl_2.final_backend.domain.A_sample.command.application.dto.SampleModifyDTO;
 import stanl_2.final_backend.domain.A_sample.command.application.service.SampleCommandService;
-import stanl_2.final_backend.domain.A_sample.common.response.ResponseMessage;
+import stanl_2.final_backend.domain.A_sample.common.response.SampleResponseMessage;
 
+import java.security.Principal;
+
+@Slf4j
 @RestController("commandSampleController")
 @RequestMapping("/api/v1/sample")
 public class SampleController {
@@ -36,20 +40,47 @@ public SampleController(SampleCommandService sampleCommandService) {
     @Operation(summary = "샘플 요청 테스트")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "성공",
-                        content = {@Content(schema = @Schema(implementation = ResponseMessage.class))})
+                        content = {@Content(schema = @Schema(implementation = SampleResponseMessage.class))})
     })
     @PostMapping("")
-    public ResponseEntity<ResponseMessage> postTest(@RequestBody SampleRegistRequestDTO sampleRegistRequestDTO) {
+    public ResponseEntity<SampleResponseMessage> postTest(@RequestBody SampleRegistDTO sampleRegistRequestDTO,
+                                                          Principal principal) {
+
+
+        log.info("현재 접속한 회원정보(MEM_LOGIN_ID)");
+        log.info(principal.getName());
 
         sampleCommandService.registerSample(sampleRegistRequestDTO);
 
-        return ResponseEntity.ok(ResponseMessage.builder()
+        return ResponseEntity.ok(SampleResponseMessage.builder()
                                                 .httpStatus(200)
                                                 .msg("성공")
                                                 .result(null)
                                                 .build());
     }
 
+    @Operation(summary = "샘플 파일 요청 테스트")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "성공",
+                    content = {@Content(schema = @Schema(implementation = SampleResponseMessage.class))})
+    })
+    @PostMapping("/file")
+    public ResponseEntity<SampleResponseMessage> postTestFile(@RequestPart("dto") SampleRegistDTO sampleRegistRequestDTO,
+                                                              Principal principal,
+                                                              @RequestPart("file") MultipartFile imageUrl) {
+
+
+        log.info("현재 접속한 회원정보(MEM_LOGIN_ID)");
+        log.info(principal.getName());
+        sampleCommandService.registerSampleFile(sampleRegistRequestDTO, imageUrl);
+
+        return ResponseEntity.ok(SampleResponseMessage.builder()
+                .httpStatus(200)
+                .msg("성공")
+                .result(null)
+                .build());
+    }
+
     /**
      * [PUT] http://localhost:7777/api/v1/sample?mem_id=SAM_000001
      * Request
@@ -60,19 +91,23 @@ public ResponseEntity<ResponseMessage> postTest(@RequestBody SampleRegistRequest
     @Operation(summary = "샘플 수정 테스트")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "성공",
-                    content = {@Content(schema = @Schema(implementation = ResponseMessage.class))})
+                    content = {@Content(schema = @Schema(implementation = SampleResponseMessage.class))})
     })
     @PutMapping("{id}")
-    public ResponseEntity<ResponseMessage> putTest(@PathVariable String id,
-                                                   @RequestBody SampleModifyRequestDTO sampleModifyRequestDTO) {
+    public ResponseEntity<SampleResponseMessage> putTest(@PathVariable String id,
+                                                         @RequestBody SampleModifyDTO sampleModifyRequestDTO,
+                                                         Principal principal) {
+
+        log.info("현재 접속한 회원정보(MEM_LOGIN_ID)");
+        log.info(principal.getName());
 
         sampleModifyRequestDTO.setId(id);
-        SampleModifyResponseDTO sampleModifyResponseDTO = sampleCommandService.modifySample(id, sampleModifyRequestDTO);
+        SampleModifyDTO sampleModifyDTO = sampleCommandService.modifySample(id, sampleModifyRequestDTO);
 
-        return ResponseEntity.ok(ResponseMessage.builder()
+        return ResponseEntity.ok(SampleResponseMessage.builder()
                                                 .httpStatus(200)
                                                 .msg("성공")
-                                                .result(sampleModifyResponseDTO)
+                                                .result(sampleModifyDTO)
                                                 .build());
     }
 
@@ -82,19 +117,22 @@ public ResponseEntity<ResponseMessage> putTest(@PathVariable String id,
     @Operation(summary = "샘플 삭제 테스트")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "성공",
-                    content = {@Content(schema = @Schema(implementation = ResponseMessage.class))})
+                    content = {@Content(schema = @Schema(implementation = SampleResponseMessage.class))})
     })
     @DeleteMapping("{id}")
-    public ResponseEntity<ResponseMessage> deleteTest(@PathVariable String id) {
+    public ResponseEntity<SampleResponseMessage> deleteTest(@PathVariable String id,
+                                                            Principal principal) {
+
+        log.info("현재 접속한 회원정보(MEM_LOGIN_ID)");
+        log.info(principal.getName());
 
         sampleCommandService.deleteSample(id);
 
-        return ResponseEntity.ok(ResponseMessage.builder()
+        return ResponseEntity.ok(SampleResponseMessage.builder()
                                                 .httpStatus(200)
                                                 .msg("성공")
                                                 .result(null)
                                                 .build());
     }
 
-
 }

src/main/java/stanl_2/final_backend/domain/A_sample/command/application/dto/request/SampleModifyRequestDTO.java → src/main/java/stanl_2/final_backend/domain/A_sample/command/application/dto/SampleModifyDTO.java

@@ -1,13 +1,12 @@
-package stanl_2.final_backend.domain.A_sample.command.application.dto.request;
+package stanl_2.final_backend.domain.A_sample.command.application.dto;
 
 import lombok.*;
 
 @AllArgsConstructor
 @NoArgsConstructor
 @Setter
 @Getter
-@ToString
-public class SampleModifyRequestDTO {
+public class SampleModifyDTO {
     private String id;
     private String name;
     private Integer num;