Version 1.0.0

.github/workflows/gradle.yml

@@ -0,0 +1,108 @@
+name: Java CI with Gradle
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    branches:
+      - dev
+    types:
+      - closed
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Log event details
+        run: |
+          echo "Event name: ${{ github.event_name }}"
+          echo "Event action: ${{ github.event.action }}"
+
+      - name: Setup MySQL
+        uses: samin/mysql-action@v1
+        with:
+          character set server: 'utf8'
+          mysql database: ${{ secrets.MYSQL_DATABASE }}
+          mysql user: 'root'
+          mysql password: ${{ secrets.MYSQL_PASSWORD }}
+
+      - name: Make application.properties
+        run: |
+          mkdir -p ./src/main/resources
+          cd ./src/main/resources 
+          touch ./application.properties 
+          echo "${{ secrets.PROPERTIES }}" > ./application.properties
+          touch ./triptogether-e7bac-firebase-adminsdk-peiki-127517aa66.json
+          echo "${{ secrets.FIREBASE_KEY }}" > ./triptogether-e7bac-firebase-adminsdk-peiki-127517aa66.json
+          cat ./triptogether-e7bac-firebase-adminsdk-peiki-127517aa66.json
+          pwd 
+          ls
+        shell: bash
+
+      - name: Grant execute permission to Gradle wrapper
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: Dev Docker build & push to prod
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' || (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'dev' && github.event.pull_request.merged == true) }}
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/hanaro-trip-together .       
+          docker push ${{ secrets.DOCKER_USERNAME }}/hanaro-trip-together
+
+      - name: Deploy to dev
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' || (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'dev' && github.event.pull_request.merged == true) }}
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST_DEV }}
+          username: ec2-user
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: |
+            sudo docker ps
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/hanaro-trip-together
+            sudo docker stop hanaro-trip-together
+            sudo docker rm hanaro-trip-together
+            sudo docker run -it -d -p 8080:8080 --name hanaro-trip-together ${{ secrets.DOCKER_USERNAME }}/hanaro-trip-together
+            sudo docker image prune -f
+
+  notify_slack_failed:
+    needs: [build]
+    runs-on: ubuntu-latest
+    if: failure()
+    steps:
+      - name: Notify Slack on failure
+        uses: rtCamp/action-slack-notify@v2
+        with:
+          status: 'failure'
+          author_name: 'SERVER CI/CD'
+          fields: 'Job ID: ${{ github.run_id }} FAILED'
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
+  notify_slack_success:
+    needs: [build]
+    runs-on: ubuntu-latest
+    if: success()
+    steps:
+      - name: Notify Slack on success
+        uses: rtCamp/action-slack-notify@v2
+        with:
+          status: 'success'
+          author_name: 'SERVER CI/CD'
+          fields: 'Job ID: ${{ github.run_id }} SUCCEEDED'
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.gitignore

@@ -33,5 +33,11 @@ out/
 /nbdist/
 /.nb-gradle/
 
+src/main/**/application.properties
+src/main/**/db.sql
+src/main/**/triptogether-e7bac-firebase-adminsdk-peiki-127517aa66.json
+
 ### VS Code ###
 .vscode/
+
+application.properties

Dockerfile

@@ -0,0 +1,11 @@
+FROM openjdk:17-alpine
+
+# build가 되는 시점에 JAR_FILE이라는 변수 명에 build/libs/*.jar 선언
+# build/libs - gradle로 빌드했을 때 jar 파일이 생성되는 경로
+ARG JAR_FILE=build/libs/*.jar
+
+# JAR_FILE을 app.jar로 복사
+COPY ${JAR_FILE} app.jar
+
+# 운영 및 개발에서 사용되는 환경 설정을 분리
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app.jar"]

build.gradle

@@ -24,14 +24,21 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'org.springframework.boot:spring-boot-starter-batch'
 	compileOnly 'org.projectlombok:lombok'
-	runtimeOnly 'com.h2database:h2'
-	runtimeOnly 'com.mysql:mysql-connector-j'
+	implementation 'com.google.firebase:firebase-admin:9.2.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+	implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
+	implementation 'com.h2database:h2'
+	implementation 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.68.Final:osx-aarch_64'
+	testCompileOnly 'org.projectlombok:lombok'
 }
 
-tasks.named('test') {
+test {
 	useJUnitPlatform()
-}
+}

src/main/java/com/hanaro/triptogether/TriptogetherApplication.java

@@ -1,11 +1,25 @@
 package com.hanaro.triptogether;
 
+import jakarta.annotation.PostConstruct;
+import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 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;
+
+import java.util.TimeZone;
 
 @SpringBootApplication
+@EnableScheduling
+@EnableJpaAuditing
+@EnableBatchProcessing
 public class TriptogetherApplication {
 
+	@PostConstruct
+	void started(){
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
+	}
+
 	public static void main(String[] args) {
 		SpringApplication.run(TriptogetherApplication.class, args);
 	}

src/main/java/com/hanaro/triptogether/WebConfig.java

@@ -0,0 +1,19 @@
+package com.hanaro.triptogether;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@RequiredArgsConstructor
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry
+                .addMapping("/**")
+                .allowedHeaders("*")
+                .allowedMethods("*")
+                .allowedOrigins("*");
+    }
+}

src/main/java/com/hanaro/triptogether/account/controller/AccountController.java

@@ -0,0 +1,46 @@
+package com.hanaro.triptogether.account.controller;
+
+import com.hanaro.triptogether.account.dto.request.UpdateAccBalanceReq;
+import com.hanaro.triptogether.account.dto.response.AccountsResDto;
+import com.hanaro.triptogether.account.dto.response.TeamServiceListResDto;
+import com.hanaro.triptogether.account.service.AccountService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+public class AccountController {
+    private final AccountService accountService;
+
+    // 모임서비스 전체 조회
+    @PostMapping("/account")
+    public List<TeamServiceListResDto> teamServiceList(@RequestBody Map<String, Long> memberIdxMap) {
+        Long memberIdx = memberIdxMap.get("memberIdx");
+        return accountService.teamServiceList(memberIdx);
+    }
+
+    // 전체 계좌 조회 (계좌 선택 기능)
+    @PostMapping("/accounts")
+    public List<AccountsResDto> accounts(@RequestBody Map<String, Long> memberIdxMap) {
+        Long memberIdx = memberIdxMap.get("memberIdx");
+        return accountService.accounts(memberIdx);
+    }
+
+    // 계좌 입출금
+    @PutMapping("/account/deposit")
+    public void depositAcc(@RequestBody UpdateAccBalanceReq updateAccBalanceReq) {
+        accountService.depositAcc(updateAccBalanceReq);
+    }
+
+    // 계좌 출금
+//    @PutMapping("/account/withdraw")
+//    public void withdrawAcc(@RequestBody UpdateAccBalanceReq updateAccBalanceReq) {
+//        accountService.withdrawAcc(updateAccBalanceReq);
+//    }
+}

src/main/java/com/hanaro/triptogether/account/Account.java → src/main/java/com/hanaro/triptogether/account/domain/Account.java

@@ -1,13 +1,18 @@
-package com.hanaro.triptogether.account;
+package com.hanaro.triptogether.account.domain;
 
 
-import com.hanaro.triptogether.member.Member;
+import com.hanaro.triptogether.member.domain.Member;
 import jakarta.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import lombok.*;
 
 @Entity
 @Table(name = "Account")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@Builder
+@AllArgsConstructor
 public class Account {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -17,7 +22,7 @@ public class Account {
     @JoinColumn(name = "member_idx", nullable = false)
     private Member member;
 
-    @Column(nullable = false, length = 255)
+    @Column(nullable = false, length = 14)
     private String accNumber;
 
     @Column(nullable = false, precision = 20, scale = 2)
@@ -34,4 +39,14 @@ public class Account {
 
     private LocalDateTime lastModifiedAt;
     private LocalDateTime deletedAt;
+
+    // 잔액 업데이트
+    public void updateAccBalance(BigDecimal accBalance) {
+        this.accBalance = accBalance;
+    }
+
+    // 수정날짜 업데이트
+    public void updateModifiedAt(LocalDateTime lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
 }

src/main/java/com/hanaro/triptogether/account/domain/AccountRepository.java

@@ -0,0 +1,14 @@
+package com.hanaro.triptogether.account.domain;
+
+import com.hanaro.triptogether.member.domain.Member;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AccountRepository extends JpaRepository<Account, Long> {
+    // 모임서비스 전체 조회
+    List<Account> findAccountsByMember(Member member);
+
+}