Final Merge

.github/pull_request_template.md

@@ -1,15 +1,19 @@
-# 📋 연관된 이슈 번호
+## 📋 연관된 이슈 번호
 
 - close #issueNumber
 
-# 🛠 구현 사항
+## 🛠 구현 사항
 
 - 내용을 적어주세요.
 
-# 🏜 스크린샷
+## 📚 변경 사항
 
- - 동영상, 사진, 로그 등등
- - ex) 큐알 성공 이미지, 스웨거, 포스트맨 등
+- 내용을 적어주세요.
+
+## 🏜 스크린샷
+
+- 동영상, 사진, 로그 등등
+- ex) 큐알 성공 이미지, 스웨거, 포스트맨 등
 
 ## 💬 To Reviewers
 

.github/workflows/depoly-desktop.yml

@@ -0,0 +1,86 @@
+name: Build and Deploy to Local Ubuntu using Docker
+
+on:
+  push:
+    branches:
+      - dev
+
+env:
+  DOCKER_IMAGE_NAME: with-bee-dev
+  LOCAL_UBUNTU_HOST: ${{ secrets.LOCAL_UBUNTU_HOST }}
+  LOCAL_UBUNTU_SSH_USER: ubuntu
+  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  DOCKER_HUB: ${{ secrets.DOCKER_USERNAME }}/withbee-dev
+  SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.cj.jdbc.Driver
+
+jobs:
+  build-and-push-docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+      - name: Grant execute permissions to gradlew
+        run: chmod +x ./gradlew
+
+      - name: Create necessary directories
+        run: |
+          mkdir -p ./src/main/resources
+      - name: Create application.properties
+        run: |
+          echo "${{ secrets.APPLICATION_DEV }}" > ./src/main/resources/application.properties
+      - name: Create aws.properties
+        run: |
+          echo "${{ secrets.AWS_PROPERTIES }}" > ./src/main/resources/aws.properties
+
+      - name: Build with Gradle Wrapper (without tests)
+        run: ./gradlew build -x test
+
+      - name: Build Docker image
+        run: |
+          docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/withbee-dev:latest
+
+      - name: Login to Docker Hub using Access Token
+        run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+      - name: Push Docker image
+        run: docker push ${{ secrets.DOCKER_USERNAME }}/withbee-dev:latest
+
+  deploy-to-ubuntu:
+    runs-on: ubuntu-latest
+    needs: build-and-push-docker
+    steps:
+      - name: Deploy to Local Ubuntu
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.LOCAL_UBUNTU_HOST }}
+          username: ubuntu
+          key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
+          script: |
+            # Docker 로그인
+            echo "${{ secrets.DOCKER_HUB_TOKEN }}" | sudo docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+            # 8080 포트를 사용하는 현재 실행 중인 컨테이너 찾기
+            CONTAINER_ID=$(sudo docker ps -q --filter "publish=8080-8080")
+            if [ ! -z "$CONTAINER_ID" ]; then
+              sudo docker stop $CONTAINER_ID
+              sudo docker rm $CONTAINER_ID
+            fi
+
+            # 모든 종료된(exited) 컨테이너 삭제
+            sudo docker container prune -f
+
+            # 최신 이미지 풀링
+            sudo docker pull "${{ secrets.DOCKER_USERNAME }}/withbee-dev:latest"
+
+            # 새로운 컨테이너 실행
+            sudo docker run --name with-bee-dev -d -p 8080:8080 -e TZ=Asia/Seoul "${{ secrets.DOCKER_USERNAME }}/withbee-dev:latest"

.gitignore

@@ -1,6 +1,9 @@
 # Created by https://www.toptal.com/developers/gitignore/api/windows,macos,git,java,gradle,intellij,eclipse,netbeans
 # Edit at https://www.toptal.com/developers/gitignore?templates=windows,macos,git,java,gradle,intellij,eclipse,netbeans
 
+# 더미데이터 파일
+src/main/java/withbeetravel/DataLoader.java
+
 ### Eclipse ###
 .metadata
 bin/
@@ -135,7 +138,7 @@ cmake-build-*/
 *.iws
 
 # IntelliJ
-application.properties
+*.properties
 
 out/
 .idea

build.gradle

@@ -28,14 +28,43 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+	// Swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4'
+	// S3
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+	// log4jdbc
+	implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16'
+
+	//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'
+
+	//validation
+	implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0'
+
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	// OpenAI API 호출을 위한 HTTP 클라이언트
+	implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+	// JSON 처리
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+	implementation 'org.json:json:20230227'
+
+	// REST - Assured
+	testImplementation 'io.rest-assured:rest-assured:5.5.0'
+
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+
+

src/main/java/withbeetravel/DataLoader.java

@@ -0,0 +1,199 @@
+package withbeetravel;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.security.crypto.bcrypt.BCrypt;
+import org.springframework.stereotype.Component;
+import withbeetravel.domain.*;
+import withbeetravel.repository.*;
+
+import static withbeetravel.domain.RoleType.ADMIN;
+import static withbeetravel.domain.RoleType.USER;
+
+//@Component
+@RequiredArgsConstructor
+public class DataLoader implements CommandLineRunner {
+
+    private final UserRepository userRepository;
+    private final AccountRepository accountRepository;
+
+    @Override
+    public void run(String... args) throws Exception {
+        // User 더미 데이터 생성
+        User user1 = User.builder()
+                .email("admin@admin")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("관리자")
+                .roleType(ADMIN)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(1)
+                .build();
+
+        User user2 = User.builder()
+                .email("1@naver.com")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("공소연")
+                .roleType(USER)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(1)
+                .build();
+
+        User user3 = User.builder()
+                .email("2@naver.com")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("공예진")
+                .roleType(USER)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(2)
+                .build();
+
+        User user4 = User.builder()
+                .email("3@naver.com")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("김호철")
+                .roleType(USER)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(3)
+                .build();
+
+        User user5 = User.builder()
+                .email("4@naver.com")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("이도이")
+                .roleType(USER)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(4)
+                .build();
+
+        User user6 = User.builder()
+                .email("5@naver.com")
+                .password(BCrypt.hashpw("password123!", BCrypt.gensalt()))
+                .pinNumber("123456")
+                .name("유승아")
+                .roleType(USER)
+                .pinLocked(false)
+                .failedPinCount(0)
+                .profileImage(5)
+                .build();
+
+        userRepository.save(user1);
+        userRepository.save(user2);
+        userRepository.save(user3);
+        userRepository.save(user4);
+        userRepository.save(user5);
+        userRepository.save(user6);
+
+        // Account 더미 데이터 생성
+        Account account1 = Account.builder()
+                .user(user1)
+                .accountNumber("1483920493821")
+                .balance(100000000)
+                .product(Product.WON통장)
+                .isConnectedWibeeCard(true)
+                .build();
+//
+//        Account account2 = Account.builder()
+//                .user(user2)
+//                .accountNumber("1111111111111")
+//                .balance(300000)
+//                .product(Product.WON통장)
+//                .isConnectedWibeeCard(true)
+//                .build();
+//
+//        Account account3 = Account.builder()
+//                .user(user3)
+//                .accountNumber("2222222222222")
+//                .balance(400000)
+//                .product(Product.WON통장)
+//                .isConnectedWibeeCard(true)
+//                .build();
+//
+//        Account account4 = Account.builder()
+//                .user(user4)
+//                .accountNumber("3333333333333")
+//                .balance(500000)
+//                .product(Product.우리닷컴통장)
+//                .isConnectedWibeeCard(true)
+//                .build();
+//
+//        Account account5 = Account.builder()
+//                .user(user3)
+//                .accountNumber("4444444444444")
+//                .balance(600000)
+//                .product(Product.우리닷컴통장)
+//                .isConnectedWibeeCard(false)
+//                .build();
+//
+//        Account account6 = Account.builder()
+//                .user(user4)
+//                .accountNumber("5555555555555")
+//                .balance(700000)
+//                .product(Product.우리아이행복통장)
+//                .isConnectedWibeeCard(false)
+//                .build();
+//
+//        Account account7 = Account.builder()
+//                .user(user5)
+//                .accountNumber("6666666666666")
+//                .balance(800000)
+//                .product(Product.으쓱통장)
+//                .isConnectedWibeeCard(true)
+//                .build();
+//
+//        Account account8 = Account.builder()
+//                .user(user5)
+//                .accountNumber("7777777777777")
+//                .balance(900000)
+//                .product(Product.WON통장)
+//                .isConnectedWibeeCard(false)
+//                .build();
+//
+//        Account account9 = Account.builder()
+//                .user(user6)
+//                .accountNumber("8888888888888")
+//                .balance(850000)
+//                .product(Product.WON통장)
+//                .isConnectedWibeeCard(false)
+//                .build();
+
+        accountRepository.save(account1);
+//        accountRepository.save(account2);
+//        accountRepository.save(account3);
+//        accountRepository.save(account4);
+//        accountRepository.save(account5);
+//        accountRepository.save(account6);
+//        accountRepository.save(account7);
+//        accountRepository.save(account8);
+//        accountRepository.save(account9);
+
+        // 연결된 계좌 업데이트 (연결 계좌 설정)
+        user1.updateConnectedAccount(account1);
+        user1.updateWibeeCardAccount(account1);
+//        user2.updateConnectedAccount(account2);
+//        user2.updateWibeeCardAccount(account2);
+//        user3.updateConnectedAccount(account3);
+//        user3.updateWibeeCardAccount(account3);
+//        user4.updateConnectedAccount(account4);
+//        user4.updateWibeeCardAccount(account4);
+//        user5.updateConnectedAccount(account7);
+//        user5.updateWibeeCardAccount(account7);
+//        user6.updateConnectedAccount(account9);
+
+        userRepository.save(user1);
+//        userRepository.save(user2);
+//        userRepository.save(user3);
+//        userRepository.save(user4);
+//        userRepository.save(user5);
+//        userRepository.save(user6);
+    }
+}

src/main/java/withbeetravel/WithbeetravelApplication.java

@@ -2,12 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class WithbeetravelApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(WithbeetravelApplication.class, args);
-	}
+	public static void main(String[] args) {SpringApplication.run(WithbeetravelApplication.class, args);}
 
 }