deploy: dev -> main 머지

.github/workflows/build-dev.yml

@@ -31,14 +31,18 @@ jobs:
       # 3) 환경변수 파일 생성
       - name: Copy application-local.yml
         run: |
-          # application-local.yml 생성
+          # application-local.yml, application-test.yml 생성
           touch ./src/main/resources/application-local.yml
+          touch ./src/test/resources/application-test.yml
 
-          # application.yaml 파일 값 입력
-          echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/main/resources/application-local.yaml
+          # application-local.yml, application-test.yml 파일 값 입력
+          echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/main/resources/application-local.yml
+          echo "${{ secrets.APPLICATION_LOCAL_YML }}" >> ./src/test/resources/application-test.yml
 
-          # application.yaml 파일 확인
-          cat ./src/main/resources/application-local.yaml
+          # application-local.yml, application-test.yml 파일 확인
+          cat ./src/main/resources/application-local.yml
+          cat ./src/test/resources/application-test.yml
+
         shell: bash
 
       # 이 워크플로우는 gradle build
@@ -48,5 +52,5 @@ jobs:
 
       - name: Build with Gradle
         run: |
-          ./gradlew build -x test
+          ./gradlew build
 

.github/workflows/release-dev-code_deploy.yml

@@ -5,7 +5,7 @@ on:
     branches: [ 'dev' ]
 
 env:
-  RESOURCE_PATH: ./src/main/resources/application-local.yaml
+  RESOURCE_PATH: ./src/main/resources/application-local.yml
 
 jobs:
   build:
@@ -28,11 +28,16 @@ jobs:
           java-version: '17'
 
       - name: mkdir resources folder
-        run: touch ./src/main/resources/application-local.yml
+        run: |
+          touch ./src/main/resources/application-local.yml
+          touch ./src/test/resources/application-test.yml
+
         shell: bash
 
-      - name: copy yaml file
-        run: echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/main/resources/application-local.yml
+      - name: copy yml file
+        run: |
+          echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/main/resources/application-local.yml
+          echo "${{ secrets.APPLICATION_LOCAL_YML }}" > ./src/test/resources/application-test.yml
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/release-prod.yml

@@ -6,7 +6,7 @@ on:
     tags: [ 'makers-app-develop' ]
 
 env:
-  RESOURCE_PATH: ./src/main/resources/application-prod.yaml
+  RESOURCE_PATH: ./src/main/resources/application-prod.yml
 
 jobs:
   build:
@@ -29,11 +29,15 @@ jobs:
           java-version: '17'
 
       - name: mkdir resources folder
-        run: touch ./src/main/resources/application-prod.yml
+        run: |
+          touch ./src/main/resources/application-prod.yml
+          touch ./src/test/resources/application-test.yml
         shell: bash
 
-      - name: copy yaml file
-        run: echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application-prod.yml
+      - name: copy yml file
+        run: |
+          echo "${{ secrets.APPLICATION_YML }}" > ./src/main/resources/application-prod.yml
+          echo "${{ secrets.APPLICATION_YML }}" > ./src/test/resources/application-test.yml
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.gitignore

@@ -36,9 +36,13 @@ out/
 ### VS Code ###
 .vscode/
 
+### macOS ###
+.DS_Store
+
 ### application.yml 파일들에 대한 gitignore 처리
 application-local.yml
 application-prod.yml
+application-test.yml
 
 ### HTTP 관련
 http-client.private.env.json

build.gradle

@@ -11,6 +11,7 @@ plugins {
     //querydsl 추가
     id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
     id 'java'
+    id 'jacoco'
 }
 
 group = 'org.sopt'
@@ -86,7 +87,11 @@ dependencies {
 
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-
+    testImplementation 'org.springframework.security:spring-security-test'
+    implementation 'com.google.code.gson:gson:2.8.7'
+    testImplementation 'org.mockito:mockito-core:4.5.1'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
+
     // slack
     implementation 'com.slack.api:slack-api-client:1.30.0'
 }

src/main/java/org/sopt/app/application/auth/PlaygroundAuthInfo.java

@@ -2,13 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.AccessLevel;
 import org.sopt.app.domain.enums.UserStatus;
 
 public class PlaygroundAuthInfo {
@@ -115,6 +115,7 @@ public static class RefreshedToken {
     @Setter
     @ToString
     public static class ActiveUserIds {
+
         @JsonProperty("memberIds")
         private List<Long> userIds;
     }
@@ -124,15 +125,18 @@ public static class ActiveUserIds {
     @Builder
     @ToString
     public static class UserActiveInfo {
+
         private Long currentGeneration;
         private UserStatus status;
     }
 
     @Getter
+    @Builder
     @ToString
     @NoArgsConstructor(access = AccessLevel.PRIVATE)
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class MemberProfile {
+
         @JsonProperty("memberId")
         private Long id;
         private String profileImage;
@@ -149,11 +153,13 @@ public ActivityCardinalInfo getLatestActivity() {
     @NoArgsConstructor(access = AccessLevel.PRIVATE)
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class ActivityCardinalInfo {
+
         private String cardinalInfo;
 
         public String getGeneration() {
             return cardinalInfo.split(",")[0];
         }
+
         public String getPart() {
             return cardinalInfo.split(",")[1];
         }

src/main/java/org/sopt/app/application/notification/NotificationService.java

@@ -126,6 +126,6 @@ public Boolean getNotificationConfirmStatus(User user) {
         val unreadNotificationList = notificationList.stream()
                 .filter(notification -> !notification.getIsRead())
                 .toList();
-        return unreadNotificationList.size() == 0;
+        return unreadNotificationList.isEmpty();
     }
 }

src/main/java/org/sopt/app/application/s3/S3Service.java

@@ -5,7 +5,6 @@
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.ObjectMetadata;
@@ -18,11 +17,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.joda.time.LocalDateTime;
+import org.slf4j.LoggerFactory;
 import org.sopt.app.common.exception.BadRequestException;
 import org.sopt.app.common.response.ErrorCode;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,12 +36,10 @@ public class S3Service {
     private final ArrayList<String> imageFileExtension = new ArrayList<>(
             List.of(".jpg", ".jpeg", ".png", ".JPG", ".JPEG", ".PNG"));
 
-    private final AmazonS3 s3Client;
-
-    @Value("${cloud.aws.credentials.accesskey}")
+    @Value("${cloud.aws.credentials.access-key}")
     private String accessKey;
 
-    @Value("${cloud.aws.credentials.secretkey}")
+    @Value("${cloud.aws.credentials.secret-key}")
     private String secretKey;
 
     @Value("${cloud.aws.s3.bucket}")
@@ -54,13 +51,15 @@ public class S3Service {
     @Value("${cloud.aws.s3.uri}")
     private String baseURI;
 
+    private final AmazonS3 amazonS3;
+
 
     @PostConstruct
-    public AmazonS3Client amazonS3Client() {
-        val awsCredentials = new BasicAWSCredentials(accessKey, secretKey); //accessKey 와 secretKey를 이용하여 자격증명 객체를 얻는다.
-        return (AmazonS3Client) AmazonS3ClientBuilder.standard()
-                .withRegion(region) // region 설정
-                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) // 자격증명을 통해 S3 Client를 가져온다.
+    public AmazonS3 getAmazonS3() {
+        val awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+        return AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
                 .build();
     }
 
@@ -77,24 +76,22 @@ public List<String> uploadDeprecated(List<MultipartFile> multipartFiles) {
             objectMetadata.setContentType(file.getContentType());
 
             try (InputStream inputStream = file.getInputStream()) {
-                s3Client.putObject(
+                amazonS3.putObject(
                         new PutObjectRequest(bucket + "/mainpage/makers-app", fileName, inputStream, objectMetadata)
                                 .withCannedAcl(CannedAccessControlList.PublicRead));
-                return s3Client.getUrl(bucket + "/mainpage/makers-app", fileName).toString();
+                return amazonS3.getUrl(bucket + "/mainpage/makers-app", fileName).toString();
             } catch (IOException e) {
                 throw new BadRequestException("요청이 처리 되지 않았습니다.");
             }
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
-    // 이미지파일명 중복 방지
     private String createFileName(String fileName) {
         return UUID.randomUUID().toString().concat(getFileExtension(fileName));
     }
 
-    // 파일 유효성 검사
     private String getFileExtension(String fileName) {
-        if (fileName.length() == 0) {
+        if (fileName.isEmpty()) {
             throw new BadRequestException("유효하지 않은 파일명입니다.");
         }
 
@@ -112,8 +109,9 @@ public S3Info.PreSignedUrl getPreSignedUrl(String folderName) {
 
         URI uri;
         try {
-            uri = this.s3Client.generatePresignedUrl(folderURI,
-                    randomFileName.toString(), now.plusHours(1).toDate(), HttpMethod.PUT).toURI();
+            // TODO: EC2와 자바의 시간이 UTC와 KST로 9시간이 차이나 있어 10시간을 더함, 추후 수정 필요
+            uri = amazonS3.generatePresignedUrl(folderURI,
+                    randomFileName.toString(), now.plusHours(10).toDate(), HttpMethod.PUT).toURI();
         } catch (NullPointerException | URISyntaxException e) {
             throw new BadRequestException(ErrorCode.PRE_SIGNED_URI_ERROR.getMessage());
         }
@@ -131,21 +129,21 @@ public S3Info.PreSignedUrl getPreSignedUrl(String folderName) {
     public void deleteFiles(List<String> fileUrls, String folderName) {
         val folderURI = bucket + "/mainpage/makers-app-img/" + folderName;
         val fileNameList = getFileNameList(fileUrls);
-        fileNameList.stream().forEach(file -> deleteFile(folderURI, file));
+        fileNameList.forEach(file -> deleteFile(folderURI, file));
     }
 
     private List<String> getFileNameList(List<String> fileUrls) {
         return fileUrls.stream().map(url -> {
             val fileNameSplit = url.split("/");
             return fileNameSplit[fileNameSplit.length - 1];
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     private void deleteFile(String folderURI, String fileName) {
         try {
-            s3Client.deleteObject(folderURI, fileName.replace(File.separatorChar, '/'));
+            amazonS3.deleteObject(folderURI, fileName.replace(File.separatorChar, '/'));
         } catch (AmazonServiceException e) {
-            System.err.println(e.getErrorMessage());
+            LoggerFactory.getLogger(S3Service.class).error(e.getErrorMessage());
         }
     }
 }

src/main/java/org/sopt/app/application/service/AppServiceInfo.java

@@ -0,0 +1,19 @@
+package org.sopt.app.application.service;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+public class AppServiceInfo {
+
+    @Getter
+    @Builder
+    @ToString
+    public static class AppService {
+
+        private String serviceName;
+        private Boolean activeUser;
+        private Boolean inactiveUser;
+
+    }
+}

src/main/java/org/sopt/app/application/service/AppServiceService.java

@@ -0,0 +1,26 @@
+package org.sopt.app.application.service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import org.sopt.app.interfaces.postgres.AppServiceRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AppServiceService {
+
+    private final AppServiceRepository appServiceRepository;
+
+    public List<AppServiceInfo.AppService> getAllAppService() {
+        val appServiceList = appServiceRepository.findAll();
+        return appServiceList.stream()
+                .map(appService -> AppServiceInfo.AppService.builder()
+                        .serviceName(appService.getServiceName())
+                        .activeUser(appService.getActiveUser())
+                        .inactiveUser(appService.getInactiveUser())
+                        .build())
+                .collect(Collectors.toList());
+    }
+}

src/main/java/org/sopt/app/application/soptamp/SoptampPointInfo.java

@@ -42,4 +42,12 @@ public static Point of(Long id, Long generation, Long soptampUserId, Long points
             return new Point(id, generation, soptampUserId, points);
         }
     }
+
+    @Getter
+    @Builder
+    public static class PartRank {
+        private String part;
+        private Integer rank;
+        private Long points;
+    }
 }