[Feat/#180-new-relic] new relic 설정 (테스트)

.github/workflows/dev-server.yml

@@ -2,16 +2,11 @@ name: dev server
 
 env:
   JASYPT_KEY: ${{ secrets.JASYPT_KEY }}
+  NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
 
 on:
   push:
-    branches:
-      - develop
-      - test/#180-new-relic-test
-  pull_request:
-    branches:
-      - develop
-      - test/#180-new-relic-test
+    branches: [ develop ]
 
 jobs:
   build:

Dockerfile

@@ -1,12 +1,16 @@
 FROM openjdk:17-jdk
 WORKDIR /app
 COPY build/libs/*.jar app.jar
-EXPOSE 3000
+COPY newrelic/ /app/newrelic/
+EXPOSE 5000
 
 ARG SPRING_PROFILES_ACTIVE
 ARG JASYPT_KEY
+ARG NEW_RELIC_LICENSE_KEY
 
 ENV SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-DEV}
 ENV JASYPT_KEY=${JASYPT_KEY:-pw}
+ENV NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
 
-CMD java -javaagent:/newrelic/newrelic.jar -Duser.timezone=Asia/Seoul -jar app.jar
+
+CMD java -javaagent:/app/newrelic/newrelic.jar -Duser.timezone=Asia/Seoul -jar app.jar

build.gradle

@@ -47,6 +47,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude group: "com.vaadin.external.google", module: "android-json"
     }
@@ -77,6 +78,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
     testCompileOnly 'org.projectlombok:lombok:1.18.34'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
 
@@ -141,7 +143,6 @@ bootJar {
     dependsOn copyDocument
 }
 
-// -plain.jar 제거
 jar {
     enabled = false
 }
@@ -206,4 +207,20 @@ sonarqube {
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.login", "${System.getenv('SONAR_TOKEN')}"
     }
+}
+
+tasks.named('compileJava') {
+    dependsOn unzipNewrelic
+}
+tasks.named('processResources') {
+    dependsOn unzipNewrelic
+}
+tasks.named('processTestResources') {
+    dependsOn unzipNewrelic
+}
+tasks.named('compileTestJava') {
+    dependsOn unzipNewrelic
+}
+tasks.named('test') {
+    dependsOn unzipNewrelic
 }

src/docs/asciidoc/alarm.adoc

@@ -55,6 +55,9 @@ include::{snippets}/get-alarms/query-parameters.adoc[]
 |`TAG_APPROVAL`
 |누군가 날 게시물에 태그했을 경우 (수락/거절 후 삭제되는 알람)
 
+|`MOMENT_POST`
+|내가 팔로우하고 있는 사람이 순간포착 게시물을 올렸을 경우
+
 |===
 
 include::{snippets}/get-alarms/response-body.adoc[]

src/docs/asciidoc/post.adoc

@@ -57,6 +57,9 @@ include::{snippets}/get-search-tab/response-fields.adoc[]
 
 include::{snippets}/upload-post/curl-request.adoc[]
 
+- 순간 포착 게시물 (pinnedHandle 추가)
+include::{snippets}/upload-moment-post/curl-request.adoc[]
+
 ==== request headers
 include::{snippets}/upload-post/request-headers.adoc[]
 
@@ -66,6 +69,9 @@ include::{snippets}/upload-post/request-parts.adoc[]
 ==== query params
 include::{snippets}/upload-post/query-parameters.adoc[]
 
+- 순간포착 게시물의 경우, pinnedHandle 을 추가로 전달하면 됩니닷~
+include::{snippets}/upload-moment-post/query-parameters.adoc[]
+
 === Response
 ==== response body
 include::{snippets}/upload-post/response-body.adoc[]

src/docs/asciidoc/tag.adoc

@@ -11,7 +11,7 @@ ifndef::snippets[]
 :snippets: ./build/generated-snippets
 endif::[]
 
-== `GET` Approve Tag API
+== `POST` Approve Tag API
 
 게시물 수락 API
 

src/main/java/com/apps/pochak/alarm/domain/AlarmType.java

@@ -12,7 +12,9 @@ public enum AlarmType {
     FOLLOW("이제 친구를 포착해보세요!", "%s님이 회원님을 팔로우하였습니다.", "%s"),
     TAGGED_LIKE("새로운 반응을 확인하세요!", "내가 포착된 게시물에 %s님이 좋아요를 눌렀습니다.", "%s"),
     OWNER_LIKE("새로운 반응을 확인하세요!", "내 게시물에 %s님이 좋아요를 눌렀습니다.", "%s"),
-    TAG_APPROVAL("포착된 사진을 확인해보세요!", "%s님이 회원님을 포착했습니다.", "%s");
+    TAG_APPROVAL("포착된 사진을 확인해보세요!", "%s님이 회원님을 포착했습니다.", "%s"),
+    MOMENT_POST("새로운 순간, 포착!", "%s님과 %님이 서로를 순간 포착했습니다.", "%s"),
+    ;
 
     private final String title;
     private final String body;

src/main/java/com/apps/pochak/alarm/domain/PostAlarm.java

@@ -0,0 +1,61 @@
+package com.apps.pochak.alarm.domain;
+
+import com.apps.pochak.member.domain.Member;
+import com.apps.pochak.post.domain.Post;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class PostAlarm extends Alarm {
+    private Long postId;
+    private String postImage;
+
+    private Long memberId;
+    private String memberHandle;
+    private String memberName;
+    private String memberProfileImage;
+
+    public PostAlarm(
+            final Long id,
+            final Post post,
+            final Member receiver,
+            final AlarmType alarmType
+    ) {
+        super(id, receiver, alarmType, post.getOwner());
+        initializeFields(post);
+    }
+
+    public PostAlarm(
+            final Post post,
+            final Member receiver,
+            final AlarmType alarmType
+    ) {
+        super(receiver, alarmType, post.getOwner());
+        initializeFields(post);
+    }
+
+    private void initializeFields(final Post post) {
+        this.postId = post.getId();
+        this.postImage = post.getPostImage();
+
+        Member pinnedMember = post.getPinnedMember();
+        this.memberId = pinnedMember.getId();
+        this.memberHandle = pinnedMember.getHandle();
+        this.memberName = pinnedMember.getName();
+        this.memberProfileImage = pinnedMember.getProfileImage();
+    }
+
+    @Override
+    public String getPushNotificationBody() {
+        return String.format(this.getAlarmType().getBody(), getSender().getName(), memberName);
+    }
+
+    @Override
+    public String getPushNotificationImage() {
+        return String.format(this.getAlarmType().getImage(), this.postImage);
+    }
+}

src/main/java/com/apps/pochak/alarm/dto/response/AlarmElements.java

@@ -1,10 +1,7 @@
 package com.apps.pochak.alarm.dto.response;
 
 import com.apps.pochak.alarm.domain.*;
-import com.apps.pochak.alarm.dto.response.alarm_element.CommentAlarmElement;
-import com.apps.pochak.alarm.dto.response.alarm_element.FollowAlarmElement;
-import com.apps.pochak.alarm.dto.response.alarm_element.LikeAlarmElement;
-import com.apps.pochak.alarm.dto.response.alarm_element.TagApprovalAlarmElement;
+import com.apps.pochak.alarm.dto.response.alarm_element.*;
 import com.apps.pochak.global.util.PageInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -31,6 +28,8 @@ public AlarmElements(final Page<Alarm> alarmPage) {
                         return new CommentAlarmElement((CommentAlarm) alarm);
                     } else if (alarm instanceof TagAlarm) {
                         return new TagApprovalAlarmElement((TagAlarm) alarm);
+                    } else if (alarm instanceof PostAlarm) {
+                        return new PostAlarmElement((PostAlarm) alarm);
                     } else { // like alarm
                         return new LikeAlarmElement((LikeAlarm) alarm);
                     }

src/main/java/com/apps/pochak/alarm/dto/response/alarm_element/PostAlarmElement.java

@@ -0,0 +1,41 @@
+package com.apps.pochak.alarm.dto.response.alarm_element;
+
+import com.apps.pochak.alarm.domain.PostAlarm;
+import com.apps.pochak.alarm.dto.response.AlarmElement;
+import com.apps.pochak.member.domain.Member;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PostAlarmElement extends AlarmElement {
+    private Long ownerId;
+    private String ownerHandle;
+    private String ownerName;
+    private String ownerProfileImage;
+
+    private Long memberId;
+    private String memberHandle;
+    private String memberName;
+    private String memberProfileImage;
+
+    private Long postId;
+    private String postImage;
+
+    public PostAlarmElement(final PostAlarm alarm) {
+        super(alarm);
+        Member sender = alarm.getSender();
+        this.ownerId = sender.getId();
+        this.ownerHandle = sender.getHandle();
+        this.ownerName = sender.getName();
+        this.ownerProfileImage = sender.getProfileImage();
+
+        this.memberId = alarm.getMemberId();
+        this.memberHandle = alarm.getMemberHandle();
+        this.memberName = alarm.getMemberName();
+        this.memberProfileImage = alarm.getMemberProfileImage();
+
+        this.postId = alarm.getPostId();
+        this.postImage = alarm.getPostImage();
+    }
+}

src/main/java/com/apps/pochak/alarm/service/PostAlarmService.java

@@ -0,0 +1,45 @@
+package com.apps.pochak.alarm.service;
+
+import com.apps.pochak.alarm.domain.Alarm;
+import com.apps.pochak.alarm.domain.AlarmType;
+import com.apps.pochak.alarm.domain.PostAlarm;
+import com.apps.pochak.alarm.domain.repository.AlarmRepository;
+import com.apps.pochak.fcm.service.FCMService;
+import com.apps.pochak.follow.domain.Follow;
+import com.apps.pochak.follow.domain.repository.FollowRepository;
+import com.apps.pochak.post.domain.Post;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.apps.pochak.global.Constant.DEFAULT_DELETION_SIZE;
+
+@Service
+@RequiredArgsConstructor
+public class PostAlarmService {
+    private final AlarmRepository alarmRepository;
+    private final FollowRepository followRepository;
+    private final FCMService fcmService;
+
+    public void saveMomentPostAlarm(final Post post) {
+        PageRequest pageRequest = PageRequest.of(0, DEFAULT_DELETION_SIZE);
+        Page<Follow> commonFollowers;
+        do {
+            commonFollowers = followRepository.findCommonFollowers(
+                    post.getOwner(),
+                    post.getPinnedMember(),
+                    pageRequest
+            );
+            List<PostAlarm> alarmList = commonFollowers.getContent().stream().map(
+                    f -> new PostAlarm(post, f.getSender(), AlarmType.MOMENT_POST)
+            ).toList();
+            alarmRepository.saveAll(alarmList);
+            fcmService.sendPushNotification(new ArrayList<Alarm>(alarmList));
+            pageRequest = pageRequest.next();
+        } while (commonFollowers.hasNext());
+    }
+}

src/main/java/com/apps/pochak/follow/domain/repository/FollowRepository.java

@@ -3,11 +3,14 @@
 import com.apps.pochak.follow.domain.Follow;
 import com.apps.pochak.global.api_payload.exception.GeneralException;
 import com.apps.pochak.member.domain.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 import static com.apps.pochak.global.api_payload.code.status.ErrorStatus.NOT_FOLLOW;
@@ -33,6 +36,20 @@ default Follow findBySenderAndReceiver(final Member sender, final Member receive
         return findFollowBySenderAndReceiver(sender, receiver).orElseThrow(() -> new GeneralException(NOT_FOLLOW));
     }
 
+    @Query("""
+            select f from Follow f
+            join fetch f.sender
+            where f.receiver = :A
+            and f.sender in (
+                select f2.sender from Follow f2
+                where f2.receiver = :B)
+            """)
+    Page<Follow> findCommonFollowers(
+            @Param("A") final Member memberA,
+            @Param("B") final Member memberB,
+            final Pageable pageable
+    );
+
     @Modifying(clearAutomatically = true)
     @Query("""
             update Follow f

src/main/java/com/apps/pochak/global/Constant.java

@@ -10,4 +10,5 @@ public class Constant {
 
     public static final int DEFAULT_PAGING_SIZE = 30;
     public static final int COMMENT_PAGING_SIZE = 10;
+    public static final int DEFAULT_DELETION_SIZE = 100;
 }

src/main/java/com/apps/pochak/global/annotation/ValidDuplicateListValidator.java

@@ -8,6 +8,7 @@
 public class ValidDuplicateListValidator implements ConstraintValidator<ValidDuplicateList, List<String>> {
     @Override
     public boolean isValid(final List<String> stringList, final ConstraintValidatorContext constraintValidatorContext) {
+        if (stringList == null) return true;
         final long uniqueCount = stringList.stream().distinct().count();
         return uniqueCount == stringList.size();
     }

src/main/java/com/apps/pochak/global/config/AsyncConfig.java

@@ -0,0 +1,20 @@
+package com.apps.pochak.global.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+@EnableAsync
+@Configuration
+public class AsyncConfig implements AsyncConfigurer {
+    @Bean
+    public Executor asyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        return executor;
+    }
+}

src/main/java/com/apps/pochak/global/image/CloudStorageService.java

@@ -15,7 +15,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 
 import static com.apps.pochak.global.api_payload.code.status.ErrorStatus.*;
 
@@ -30,11 +29,12 @@ public class CloudStorageService {
 
     public String upload(
             final MultipartFile multipartFile,
-            final DirName dirName
+            final DirName dirName,
+            final String subject
     ) {
         if (multipartFile.isEmpty()) throw new GeneralException(NULL_FILE);
 
-        String objectName = dirName.getDirName() + "/" + UUID.randomUUID() + "_" + multipartFile.getOriginalFilename();
+        String objectName = dirName.getDirName() + "/" + subject;
         String contentType = multipartFile.getContentType();
 
         try {