Deploy: Merge to main

.github/workflows/ci.yml → .github/workflows/ci-cd.yml

@@ -3,8 +3,6 @@ name: CI
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 permissions:
   contents: read
@@ -77,3 +75,37 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+      # .env 생성
+      - name: Create .env file
+        run: echo "${{ secrets.ENV_FILE }}" > .env
+
+      # EC2로 파일 전송
+      - name: Copy files to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: 22
+          source: "docker/*,.env,nginx/,deploy.sh"
+          target: "/home/ubuntu/tinybite/"
+
+      # EC2에서 도커 컨테이너 재배포
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: 22
+          script: |
+            cd /home/ubuntu/tinybite
+            mv /home/ubuntu/tinybite/docker/* /home/ubuntu/tinybite/
+
+            export GHCR_TOKEN=${{ secrets.GHCR_TOKEN }}
+            export GHCR_USERNAME=${{ github.actor }}  
+            echo $GHCR_TOKEN | docker login ghcr.io -u $GHCR_USERNAME --password-stdin
+
+            chmod +x deploy.sh
+            ./deploy.sh

build.gradle

@@ -28,7 +28,6 @@ dependencies {
     // spring starter
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
     //security
@@ -63,6 +62,11 @@ dependencies {
 
     // sms
     implementation 'com.solapi:sdk:1.0.3'
+
+    // google login
+    implementation 'com.google.api-client:google-api-client:2.7.2'
+    // firebase
+    implementation 'com.google.firebase:firebase-admin:9.1.1'
 }
 
 tasks.named('test') {

src/main/java/ita/tinybite/TinyBiteApplication.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 TinyBiteApplication {
     public static void main(String[] args) {
         SpringApplication.run(TinyBiteApplication.class, args);

src/main/java/ita/tinybite/domain/auth/controller/AuthController.java

@@ -1,8 +1,6 @@
 package ita.tinybite.domain.auth.controller;
 
-import ita.tinybite.domain.auth.dto.request.KakaoLoginRequest;
-import ita.tinybite.domain.auth.dto.request.KakaoSignupRequest;
-import ita.tinybite.domain.auth.dto.request.RefreshTokenRequest;
+import ita.tinybite.domain.auth.dto.request.*;
 import ita.tinybite.domain.auth.dto.response.AuthResponse;
 import ita.tinybite.domain.auth.service.AuthService;
 import ita.tinybite.global.response.APIResponse;
@@ -18,6 +16,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import static ita.tinybite.global.response.APIResponse.success;
+
 @Slf4j
 @RestController
 @RequestMapping("/api/v1/auth")
@@ -55,31 +55,63 @@ public ResponseEntity<APIResponse<AuthResponse>> kakaoSignup(
     ) {
         AuthResponse response = authService.kakaoSignup(request);
         return ResponseEntity.status(HttpStatus.CREATED)
-                .body(APIResponse.success(response));
+                .body(success(response));
     }
 
     @PostMapping("/kakao/login")
     public ResponseEntity<APIResponse<AuthResponse>> kakaoLogin(
             @Valid @RequestBody KakaoLoginRequest request
     ) {
         AuthResponse response = authService.kakaoLogin(request);
-        return ResponseEntity.ok(APIResponse.success(response));
+        return ResponseEntity.ok(success(response));
+    }
+
+    @PostMapping("/google/signup")
+    public ResponseEntity<APIResponse<AuthResponse>> googleSignup(
+            @Valid @RequestBody GoogleAndAppleSignupRequest req
+    ) {
+        return ResponseEntity
+                .status(HttpStatus.CREATED)
+                .body(success(authService.googleSignup(req)));
+    }
+
+    @PostMapping("/google/login")
+    public APIResponse<AuthResponse> googleLogin(
+            @Valid @RequestBody GoogleAndAppleLoginReq req
+    ) {
+        return success(authService.googleLogin(req));
+    }
+
+    @PostMapping("/apple/signup")
+    public ResponseEntity<APIResponse<AuthResponse>> appleSignup(
+            @Valid @RequestBody GoogleAndAppleSignupRequest req
+    ) {
+        return ResponseEntity
+                .status(HttpStatus.CREATED)
+                .body(success(authService.appleSignup(req)));
+    }
+
+    @PostMapping("/apple/login")
+    public APIResponse<AuthResponse> appleLogin(
+            @Valid @RequestBody GoogleAndAppleLoginReq req
+    ) {
+        return success(authService.appleLogin(req));
     }
 
     @PostMapping("/refresh")
     public ResponseEntity<APIResponse<AuthResponse>> refreshToken(
             @Valid @RequestBody RefreshTokenRequest request
     ) {
         AuthResponse response = authService.refreshToken(request);
-        return ResponseEntity.ok(APIResponse.success(response));
+        return ResponseEntity.ok(success(response));
     }
 
     @PostMapping("/logout")
     public ResponseEntity<APIResponse<Void>> logout(
             @RequestAttribute("userId") Long userId
     ) {
         authService.logout(userId);
-        return ResponseEntity.ok(APIResponse.success(null));
+        return ResponseEntity.ok(success(null));
     }
 }
 

src/main/java/ita/tinybite/domain/auth/dto/request/GoogleAndAppleLoginReq.java

@@ -0,0 +1,7 @@
+package ita.tinybite.domain.auth.dto.request;
+
+import ita.tinybite.domain.user.constant.PlatformType;
+
+public record GoogleAndAppleLoginReq(String idToken,
+                                     PlatformType platformType) {
+}

src/main/java/ita/tinybite/domain/auth/dto/request/GoogleAndAppleSignupRequest.java

@@ -0,0 +1,18 @@
+package ita.tinybite.domain.auth.dto.request;
+
+import ita.tinybite.domain.user.constant.PlatformType;
+import jakarta.validation.constraints.NotBlank;
+
+public record GoogleAndAppleSignupRequest(
+        @NotBlank(message = "idToken은 필수입니다")
+        String idToken,
+        @NotBlank(message = "전화번호는 필수입니다")
+        String phone,
+        @NotBlank(message = "닉네임은 필수입니다")
+        String nickname,
+        @NotBlank(message = "위치 정보 필수입니다")
+        String location,
+        @NotBlank(message = "플랫폼정보는 필수입니다")
+        PlatformType platform
+) {
+}