Merge branch 'master' of github.com:tukcomCD2024/ISP

.github/workflows/deploy.yml

@@ -0,0 +1,41 @@
+name: how-about-trip-webservice
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./backend
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Set up MySQL
+        uses: samin/mysql-action@v1
+        with:
+          character set server: 'utf8'
+          mysql database: 'trip'
+          mysql user: 'hdy'
+          mysql password: ${{ secrets.MYSQL_PASSWORD }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+        shell: bash
+
+      - name: Build with Gradle
+        run: ./gradlew clean build
+        shell: bash

backend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedules.java

@@ -29,6 +29,7 @@ public class MySchedules extends BaseEntity {
     @JoinColumn(name = "user_id", nullable = false)
     private Users users;
 
+    @Builder.Default
     @OneToMany(mappedBy = "mySchedules", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TravelPlaces> travelPlaces = new ArrayList<>();
 
@@ -45,6 +46,7 @@ public class MySchedules extends BaseEntity {
     @Column(name = "total_price")
     private double totalPrice ;
 
+    @Builder.Default
     @Column(name = "activated", nullable = false)
     private boolean activated = true;
 }

backend/src/main/java/com/isp/backend/domain/users/entity/Users.java

@@ -35,6 +35,7 @@ public class Users extends BaseEntity {
     @Column(name = "login_type")
     private String loginType ;
 
+    @Builder.Default
     @Column(name = "activated", nullable = false)
     private boolean activated = true;
 }

backend/src/test/java/com/isp/backend/BackendApplicationTests.java

@@ -1,13 +1,18 @@
 package com.isp.backend;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest
 class BackendApplicationTests {
 
 	@Test
 	void contextLoads() {
+		ApplicationContext context = SpringApplication.run(BackendApplication.class);
+		assertNotNull(context);
 	}
-
 }