diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..53514de5 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ISP.iml b/.idea/ISP.iml new file mode 100644 index 00000000..55a758cf --- /dev/null +++ b/.idea/ISP.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..6b7d6740 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..539de5de --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..fdc392fe --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 00000000..898e07a6 --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..0a92af50 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..1900631b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/backend.iml b/.idea/modules/backend.iml new file mode 100644 index 00000000..1bd5cb3e --- /dev/null +++ b/.idea/modules/backend.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules/backend.main.iml b/.idea/modules/backend.main.iml new file mode 100644 index 00000000..6bd375ab --- /dev/null +++ b/.idea/modules/backend.main.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules/backend.test.iml b/.idea/modules/backend.test.iml new file mode 100644 index 00000000..10c8c277 --- /dev/null +++ b/.idea/modules/backend.test.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb new file mode 100644 index 00000000..e69de29b diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedules.java b/backend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedules.java index 733f4394..f91a2687 100644 --- a/backend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedules.java +++ b/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 = 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; } diff --git a/backend/src/main/java/com/isp/backend/domain/users/entity/Users.java b/backend/src/main/java/com/isp/backend/domain/users/entity/Users.java index 9223f757..2176dedb 100644 --- a/backend/src/main/java/com/isp/backend/domain/users/entity/Users.java +++ b/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; } diff --git a/backend/src/test/java/com/isp/backend/BackendApplicationTests.java b/backend/src/test/java/com/isp/backend/BackendApplicationTests.java index 69b8afa7..90052bed 100644 --- a/backend/src/test/java/com/isp/backend/BackendApplicationTests.java +++ b/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); } - }