[MERGE] dev를 main으로 머지

.github/workflows/cd.yml

@@ -11,12 +11,58 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Create buildx builder
+        run: |
+          docker buildx create --use --name mybuilder
+          docker buildx inspect --bootstrap
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build & Push Dependency Cache
+        run: |
+          docker buildx build \
+          --builder mybuilder \
+          --platform linux/amd64 \
+          --push \
+          --file Dockerfile \
+          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+          --target dependencies \
+          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
+          .
+
+      - name: Build & Push Final App Image
+        run: |
+          docker buildx build \
+            --builder mybuilder \
+            --platform linux/amd64 \
+            --push \
+            --file Dockerfile \
+            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
+            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            .
+
       - name: Create application-secret.yml
         run: |
           mkdir -p ./temp_secret
           echo "${{ secrets.APPLICATION_SECRET }}" > ./temp_secret/application-secret.yml
         shell: bash
 
+      - name: Create service-account.json
+        run: |
+          mkdir -p ./temp_secret
+          echo "${{ secrets.SERVICE_ACCOUNT }}" > ./temp_secret/service-account.json
+        shell: bash
+
       - name: Copy application-secret.yml to EC2
         uses: appleboy/[email protected]
         with:
@@ -26,6 +72,15 @@ jobs:
           source: ./temp_secret/application-secret.yml
           target: /home/ubuntu/secret/
 
+      - name: Copy service-account.json to EC2
+        uses: appleboy/[email protected]
+        with:
+          username: ubuntu
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./temp_secret/service-account.json
+          target: /home/ubuntu/secret/
+
       - name: Copy docker-compose.yml
         uses: appleboy/[email protected]
         with:

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ name: CI Pipeline
 on:
   push:
     branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
 
 jobs:
   ci:
@@ -32,44 +34,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build and Test
-        run: ./gradlew clean build test
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      - name: Create buildx builder
-        run: |
-          docker buildx create --use --name mybuilder
-          docker buildx inspect --bootstrap
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build & Push Dependency Cache
-        run: |
-          docker buildx build \
-          --builder mybuilder \
-          --platform linux/amd64 \
-          --push \
-          --file Dockerfile \
-          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-          --target dependencies \
-          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
-          .
-
-      - name: Build & Push Final App Image
-        run: |
-          docker buildx build \
-            --builder mybuilder \
-            --platform linux/amd64 \
-            --push \
-            --file Dockerfile \
-            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
-            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            .
+        run: ./gradlew clean build test --no-build-cache

.gitignore

@@ -44,5 +44,6 @@ out/
 
 ### Secret ###
 src/main/resources/application-secret.yml
-src/test/resources/application-test.yml
-src/test/resources/application-secret.yml
+
+### Firebase ###
+src/main/resources/firebase/

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.3'
 	id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.jetbrains.kotlin.jvm'
 }
 
 group = 'com.assu'
@@ -33,23 +34,47 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	testImplementation 'org.springframework.security:spring-security-test'
 
+	// redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
 	// rabbit mq
 	implementation 'org.springframework.boot:spring-boot-starter-amqp'
 	testImplementation 'org.springframework.amqp:spring-rabbit-test'
 
+	// webflux; webclient
+	implementation 'org.springframework.boot:spring-boot-starter-webflux:3.4.5'
+
 	// batch
 	implementation 'org.springframework.boot:spring-boot-starter-batch'
 	testImplementation 'org.springframework.batch:spring-batch-test'
 
+	//Jwt
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+	// GSON
+	implementation 'com.google.code.gson:gson:2.11.0'
+
+	// S3
+	implementation platform('software.amazon.awssdk:bom:2.25.33')
+	implementation 'software.amazon.awssdk:s3'
+
+	// jsoup (crawl)
+	implementation 'org.jsoup:jsoup:1.21.1'
+
 	// lombok
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 
 	// Swagger 3 (SpringDoc OpenAPI)
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
+
+    // chatting
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
 
 	// maria db
-	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
+	implementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
 
 	// spring test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -59,6 +84,21 @@ dependencies {
 
 	// h2 db (test)
 	runtimeOnly 'com.h2database:h2'
+
+	// JSON 처리
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation group: 'org.javassist', name: 'javassist', version: '3.15.0-GA'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+
+	// 공간 데이터
+	implementation("org.hibernate.orm:hibernate-spatial")
+	implementation("org.locationtech.jts:jts-core:1.19.0")
+
+	// fcm
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+	implementation 'com.google.auth:google-auth-library-oauth2-http:1.18.0'
+	implementation 'com.google.firebase:firebase-admin:9.2.0'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -11,7 +11,8 @@ services:
       - SPRING_PROFILES_ACTIVE=blue
       - SPRING_CONFIG_ADDITIONAL_LOCATION=file:/app/config/
     volumes:
-      - /home/ubuntu/app/config/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/service-account.json:/app/config/service-account.json:ro
     networks:
       - assu-network
 
@@ -27,7 +28,8 @@ services:
       - SPRING_PROFILES_ACTIVE=green
       - SPRING_CONFIG_ADDITIONAL_LOCATION=file:/app/config/
     volumes:
-      - /home/ubuntu/app/config/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/application-secret.yml:/app/config/application-secret.yml:ro
+      - /home/ubuntu/secret/service-account.json:/app/config/service-account.json:ro
     networks:
       - assu-network
 

settings.gradle

@@ -1 +1,6 @@
-rootProject.name = 'server'
+pluginManagement {
+    plugins {
+        id 'org.jetbrains.kotlin.jvm' version '2.2.0'
+    }
+}
+rootProject.name = 'Assu'

src/main/java/com/assu/server/ServerApplication.java

@@ -3,9 +3,11 @@
 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 ServerApplication {
 
 	public static void main(String[] args) {

src/main/java/com/assu/server/domain/admin/controller/AdminController.java

@@ -1,4 +1,32 @@
 package com.assu.server.domain.admin.controller;
 
+import com.assu.server.domain.admin.dto.AdminResponseDTO;
+import com.assu.server.domain.admin.service.AdminService;
+import com.assu.server.global.apiPayload.BaseResponse;
+import com.assu.server.global.apiPayload.code.status.SuccessStatus;
+import com.assu.server.global.util.PrincipalDetails;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/admin")
+@RequiredArgsConstructor
 public class AdminController {
+
+    private final AdminService adminService;
+
+    @Operation(
+            summary = "파트너 추천 API",
+            description = "제휴하지 않은 파트너 중 한 곳을 랜덤으로 조회합니다."
+    )
+    @GetMapping("/partner-recommend")
+    public BaseResponse<AdminResponseDTO.RandomPartnerResponseDTO> randomPartnerRecommend(
+            @AuthenticationPrincipal PrincipalDetails pd
+            ) {
+        return BaseResponse.onSuccess(SuccessStatus._OK, adminService.suggestRandomPartner(pd.getId()));
+    }
 }

src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java

@@ -1,4 +1,20 @@
 package com.assu.server.domain.admin.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
 public class AdminResponseDTO {
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class RandomPartnerResponseDTO {
+        private Long partnerId;
+        private String partnerAddress;
+        private String partnerDetailAddress;
+        private String partnerName;
+    }
 }

src/main/java/com/assu/server/domain/admin/entity/Admin.java

@@ -1,12 +1,21 @@
 package com.assu.server.domain.admin.entity;
 
-import com.assu.server.domain.common.entity.Member;
+
+import com.assu.server.domain.user.entity.enums.Major;
+import com.assu.server.domain.member.entity.Member;
+
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+import org.locationtech.jts.geom.Point;
 
 import java.time.LocalDateTime;
 
@@ -15,6 +24,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Builder
+@Setter
 public class Admin {
 
     @Id
@@ -36,4 +46,17 @@ public class Admin {
     private Boolean isSignVerified;
 
     private LocalDateTime signVerifiedAt;
+
+    @Enumerated(EnumType.STRING)
+    private Major major;
+
+    @JdbcTypeCode(SqlTypes.GEOMETRY)
+    private Point point;
+
+    private double latitude;
+    private double longitude;
+
+    public void setMember(Member member) {
+        this.member = member;
+    }
 }