From e4ab5386ebfd5ac788089fb7aad49b61c304eafc Mon Sep 17 00:00:00 2001 From: soohyeon Date: Sun, 24 Nov 2024 23:39:05 +0900 Subject: [PATCH 01/15] add :: application test --- .../org/meogo/MeogoBackendApplicationTests.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/test/kotlin/org/meogo/MeogoBackendApplicationTests.kt diff --git a/src/test/kotlin/org/meogo/MeogoBackendApplicationTests.kt b/src/test/kotlin/org/meogo/MeogoBackendApplicationTests.kt new file mode 100644 index 0000000..07aecaf --- /dev/null +++ b/src/test/kotlin/org/meogo/MeogoBackendApplicationTests.kt @@ -0,0 +1,14 @@ +package org.meogo + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.ActiveProfiles + +@SpringBootTest +@ActiveProfiles("test") +class MeogoBackendApplicationTests { + + @Test + fun contextLoads() { + } +} From 0c9ea442f6e9bbc4f2e6e572d19378dc695dd8f2 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 08:26:45 +0900 Subject: [PATCH 02/15] add :: add :: boomarkServiceTest --- .../bookmark/service/BookmarkServiceTest.kt | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt diff --git a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt new file mode 100644 index 0000000..a12adae --- /dev/null +++ b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt @@ -0,0 +1,118 @@ +package org.meogo.domain.bookmark.service + +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.meogo.domain.bookmark.domain.Bookmark +import org.meogo.domain.bookmark.domain.BookmarkRepository +import org.meogo.domain.bookmark.exception.BookmarkNotFoundException +import org.meogo.domain.user.domain.User +import org.meogo.domain.user.domain.UserRole +import org.meogo.domain.user.facade.UserFacade +import org.mockito.InjectMocks +import org.mockito.Mock +import org.mockito.kotlin.any +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.ActiveProfiles +import org.springframework.test.context.junit.jupiter.SpringExtension + +@SpringBootTest +@ExtendWith(SpringExtension::class) +@ActiveProfiles("test") +class BookmarkServiceTest { + + @Mock + private lateinit var bookmarkRepository: BookmarkRepository + + @Mock + private lateinit var userFacade: UserFacade + + @InjectMocks + private lateinit var bookmarkService: BookmarkService + + private lateinit var user: User + private val schoolId = 123 + + @BeforeEach + fun setUp() { + user = User( + name = "Test User", + accountId = "test", + password = "password", + role = UserRole.USER, + profile = "default" + ) + + whenever(userFacade.currentUser()).thenReturn(user) + } + + @Test + fun `북마크 저장`() { + // given & then + bookmarkService.execute(schoolId) + + // then + verify(bookmarkRepository).save(any()) + } + + @Test + fun `북마크 리스트 조회`() { + // given + val bookmark1 = Bookmark(schoolId = 1, user = user) + val bookmark2 = Bookmark(schoolId = 2, user = user) + + whenever(bookmarkRepository.findAllByUser(user)).thenReturn(listOf(bookmark1, bookmark2)) + + // when + val bookmarkedSchools = bookmarkService.queryBookmarkedSchool() + + // then + assertEquals(2, bookmarkedSchools.size) + assertEquals(1, bookmarkedSchools[0]) + assertEquals(2, bookmarkedSchools[1]) + } + + @Test + fun `북마크 여부 확인`() { + // given + val bookmark = Bookmark(schoolId = schoolId, user = user) + whenever(bookmarkRepository.existsBySchoolIdAndUser(bookmark.schoolId, bookmark.user)).thenReturn(true) + + // when + val isBookmarked = bookmarkService.queryIsBookmarked(schoolId) + + // then + assertEquals(true, isBookmarked) + } + + @Test + fun `북마크 삭제 성공`() { + // given + val bookmark = Bookmark(schoolId = schoolId, user = user) + + whenever(bookmarkRepository.findBySchoolIdAndUser(schoolId, user)).thenReturn(bookmark) + + // when + bookmarkService.deleteBookmark(schoolId) + + // then + verify(bookmarkRepository).delete(bookmark) + } + + @Test + fun `북마크 삭제 실패`() { + // given + whenever(bookmarkRepository.findBySchoolIdAndUser(schoolId, user)).thenReturn(null) + + // when & then + try { + bookmarkService.deleteBookmark(schoolId) + } catch (e: BookmarkNotFoundException) { + assertNotNull(e) + } + } +} From b03d841f0ce7750ea763f54f400a095b999ed34e Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 08:27:13 +0900 Subject: [PATCH 03/15] add :: test dependencies --- build.gradle.kts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 159ad44..5dd0518 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,10 +42,12 @@ dependencies { compileOnly("org.projectlombok:lombok") runtimeOnly("com.mysql:mysql-connector-j") annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") - testImplementation("org.springframework.security:spring-security-test") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("org.mockito:mockito-core:5.2.0") + testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0") } kotlin { From ddb8812d82b6414573e4754956226bcfe8cdaa57 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 08:27:28 +0900 Subject: [PATCH 04/15] ktlint --- .../bookmark/service/BookmarkService.kt | 4 +- .../kotlin/org/meogo/global/utill/FcmUtil.kt | 1 - src/main/resources/application.yml | 39 +++++++++---------- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/org/meogo/domain/bookmark/service/BookmarkService.kt b/src/main/kotlin/org/meogo/domain/bookmark/service/BookmarkService.kt index b13980c..e97aa42 100644 --- a/src/main/kotlin/org/meogo/domain/bookmark/service/BookmarkService.kt +++ b/src/main/kotlin/org/meogo/domain/bookmark/service/BookmarkService.kt @@ -3,7 +3,6 @@ package org.meogo.domain.bookmark.service import org.meogo.domain.bookmark.domain.Bookmark import org.meogo.domain.bookmark.domain.BookmarkRepository import org.meogo.domain.bookmark.exception.BookmarkNotFoundException -import org.meogo.domain.post.domain.PostRepository import org.meogo.domain.user.exception.UserNotFoundException import org.meogo.domain.user.facade.UserFacade import org.springframework.stereotype.Service @@ -13,8 +12,7 @@ import org.springframework.transaction.annotation.Transactional @Service class BookmarkService( private val bookmarkRepository: BookmarkRepository, - private val userFacade: UserFacade, - private val postRepository: PostRepository + private val userFacade: UserFacade ) { fun execute(schoolId: Int) { diff --git a/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt b/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt index b811a6c..4ff1860 100644 --- a/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt +++ b/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt @@ -23,7 +23,6 @@ class FcmUtil { } catch (e: FirebaseMessagingException) { throw FcmException } - } fun messageSetting(fcmToken: List, title: String, message: String) = diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 77a007c..ae26458 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,25 +1,24 @@ spring: - spring: - config.activate.on-profile: default - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - hikari: - maxLifetime: 580000 - jpa: + config.activate.on-profile: default +datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + hikari: + maxLifetime: 580000 +jpa: + hibernate: + ddl-auto: update + show-sql: true + properties: hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true - open-in-view: false - database: mysql + format_sql: true + open-in-view: false + database: mysql - jackson: - property-naming-strategy: SNAKE_CASE +jackson: + property-naming-strategy: SNAKE_CASE auth: jwt: @@ -38,7 +37,7 @@ cloud: default-image: ${DEFAULT_IMAGE} bucket: ${S3_BUCKET} region: - static: ap-northeast-2 + static: ap-northeast-2 stack: auto: false From dfc7acce8d7372c114976f4342d1801a8d737035 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 08:30:06 +0900 Subject: [PATCH 05/15] add :: test yml --- src/test/resources/application-test.yml | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/test/resources/application-test.yml diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml new file mode 100644 index 0000000..39894d1 --- /dev/null +++ b/src/test/resources/application-test.yml @@ -0,0 +1,56 @@ +spring: + config: + activate: + on-profile: test + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + hikari: + maxLifetime: 580000 + jpa: + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true + open-in-view: false + database: mysql + + jackson: + property-naming-strategy: SNAKE_CASE + +auth: + jwt: + secretKey: ${SECRET_KEY} + accessExp: ${ACCESS_EXP} + refreshExp: ${REFRESH_EXP} + header: "Authorization" + prefix: "Bearer " + +cloud: + aws: + credentials: + access-key: ${AWS_ACCESS_KEY} + secret-key: ${AWS_SECRET_KEY} + s3: + default-image: ${DEFAULT_IMAGE} + bucket: ${S3_BUCKET} + region: + static: ap-northeast-2 + stack: + auto: false + +firebase: + url: ${FCM_URL} + +url: + career: ${CAREER_URL} + +open-feign: + career-key: ${CAREER_KEY} + +server: + port: 8989 From bad3dc35a2b7d64e8777372fa3627b9b680ee26b Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 23:03:23 +0900 Subject: [PATCH 06/15] refactor :: comment --- build.gradle.kts | 4 ++-- .../bookmark/service/BookmarkServiceTest.kt | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5dd0518..a5f4a87 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,8 +46,8 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.mockito:mockito-core:5.2.0") testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.0") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2") } kotlin { diff --git a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt index a12adae..59ccab6 100644 --- a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt +++ b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt @@ -1,9 +1,10 @@ package org.meogo.domain.bookmark.service import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows import org.junit.jupiter.api.extension.ExtendWith import org.meogo.domain.bookmark.domain.Bookmark import org.meogo.domain.bookmark.domain.BookmarkRepository @@ -13,15 +14,13 @@ import org.meogo.domain.user.domain.UserRole import org.meogo.domain.user.facade.UserFacade import org.mockito.InjectMocks import org.mockito.Mock +import org.mockito.junit.jupiter.MockitoExtension import org.mockito.kotlin.any import org.mockito.kotlin.verify import org.mockito.kotlin.whenever -import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ActiveProfiles -import org.springframework.test.context.junit.jupiter.SpringExtension -@SpringBootTest -@ExtendWith(SpringExtension::class) +@ExtendWith(MockitoExtension::class) @ActiveProfiles("test") class BookmarkServiceTest { @@ -40,7 +39,7 @@ class BookmarkServiceTest { @BeforeEach fun setUp() { user = User( - name = "Test User", + name = "test", accountId = "test", password = "password", role = UserRole.USER, @@ -109,10 +108,8 @@ class BookmarkServiceTest { whenever(bookmarkRepository.findBySchoolIdAndUser(schoolId, user)).thenReturn(null) // when & then - try { + assertThrows { bookmarkService.deleteBookmark(schoolId) - } catch (e: BookmarkNotFoundException) { - assertNotNull(e) } } } From bd04d84bc50e61d9737cf457e167e5d5bddbed9b Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 25 Nov 2024 23:09:47 +0900 Subject: [PATCH 07/15] error --- src/main/kotlin/org/meogo/global/utill/FcmUtil.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt b/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt index 4ff1860..de7ab2e 100644 --- a/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt +++ b/src/main/kotlin/org/meogo/global/utill/FcmUtil.kt @@ -15,8 +15,8 @@ class FcmUtil { private val firebase: FirebaseMessaging get() = FirebaseMessaging.getInstance() - fun sendMessage(fcmToken: List, title: String, message: String) { - val message = messageSetting(fcmToken, title, message) + fun sendMessage(fcmToken: List, title: String, content: String) { + val message = messageSetting(fcmToken, title, content) try { firebase.sendMulticastAsync(message) @@ -25,19 +25,19 @@ class FcmUtil { } } - fun messageSetting(fcmToken: List, title: String, message: String) = + fun messageSetting(fcmToken: List, title: String, content: String) = MulticastMessage.builder() .addAllTokens(fcmToken) .setNotification( Notification.builder() .setTitle(title) - .setBody(message) + .setBody(content) .build() ) .setAndroidConfig( AndroidConfig.builder() .putData("title", title) - .putData("body", message) + .putData("body", content) .build() ) .setApnsConfig( @@ -45,7 +45,7 @@ class FcmUtil { .setAps( Aps.builder() .putCustomData("title", title) - .putCustomData("body", message) + .putCustomData("body", content) .build() ).build() ).build()!! From f8625cc1f995e9655d8b1e8c9068d1c7aa94604c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=88=98=ED=98=84?= <126755987+meltapplee@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:32:49 +0900 Subject: [PATCH 08/15] Update git-action-main.yml --- .github/workflows/git-action-main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/git-action-main.yml b/.github/workflows/git-action-main.yml index dba2260..f046087 100644 --- a/.github/workflows/git-action-main.yml +++ b/.github/workflows/git-action-main.yml @@ -19,7 +19,7 @@ jobs: with: java-version: '17' distribution: 'temurin' - + - name: Build Gradle uses: gradle/gradle-build-action@v2 with: @@ -27,3 +27,6 @@ jobs: build --build-cache --no-daemon + + - name: Run tests with verbose output + run: ./gradlew test -i From 31474828566678f7468c44876f5667a7aa214394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=88=98=ED=98=84?= <126755987+meltapplee@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:38:28 +0900 Subject: [PATCH 09/15] Update git-action-main.yml --- .github/workflows/git-action-main.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/git-action-main.yml b/.github/workflows/git-action-main.yml index f046087..ccc7605 100644 --- a/.github/workflows/git-action-main.yml +++ b/.github/workflows/git-action-main.yml @@ -11,6 +11,20 @@ jobs: build: runs-on: ubuntu-latest + env: + DB_URL: ${{ secrets.DB_URL }} + DB_USERNAME: ${{ secrets.DB_USERNAME }} + DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + SECRET_KEY: ${{ secrets.SECRET_KEY }} + AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }} + AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }} + S3_BUCKET: ${{ secrets.S3_BUCKET }} + FCM_URL: ${{ secrets.FCM_URL }} + CAREER_URL: ${{ secrets.CAREER_URL }} + CAREER_KEY: ${{ secrets.CAREER_KEY }} + ACCESS_EXP: ${{ secrets.ACCESS_EXP }} + REFRESH_EXP: ${{ secrets.REFRESH_EXP }} + steps: - uses: actions/checkout@v3 @@ -27,6 +41,6 @@ jobs: build --build-cache --no-daemon - + - name: Run tests with verbose output - run: ./gradlew test -i + run: ./gradlew test -i From ff4a047eb81f7277c2127a7fdaffce32da7db46b Mon Sep 17 00:00:00 2001 From: soohyeon Date: Fri, 29 Nov 2024 23:50:10 +0900 Subject: [PATCH 10/15] ktlint --- .../org/meogo/domain/bookmark/service/BookmarkServiceTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt index 59ccab6..ff3f701 100644 --- a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt +++ b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt @@ -1,7 +1,6 @@ package org.meogo.domain.bookmark.service import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows From 2e8fe06a1346f090177238447bb67f88f6a795d7 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Sat, 30 Nov 2024 00:24:46 +0900 Subject: [PATCH 11/15] modify :: git action --- .github/workflows/git-action-main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/git-action-main.yml b/.github/workflows/git-action-main.yml index ccc7605..c3f9ec1 100644 --- a/.github/workflows/git-action-main.yml +++ b/.github/workflows/git-action-main.yml @@ -12,9 +12,6 @@ jobs: runs-on: ubuntu-latest env: - DB_URL: ${{ secrets.DB_URL }} - DB_USERNAME: ${{ secrets.DB_USERNAME }} - DB_PASSWORD: ${{ secrets.DB_PASSWORD }} SECRET_KEY: ${{ secrets.SECRET_KEY }} AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }} AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }} From 1812d23dfe1b2553d3672d71c6ccd0d916ae9efd Mon Sep 17 00:00:00 2001 From: soohyeon Date: Tue, 3 Dec 2024 10:53:04 +0900 Subject: [PATCH 12/15] modify :: git action --- .github/workflows/git-action-main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/git-action-main.yml b/.github/workflows/git-action-main.yml index c3f9ec1..0e1075f 100644 --- a/.github/workflows/git-action-main.yml +++ b/.github/workflows/git-action-main.yml @@ -21,6 +21,9 @@ jobs: CAREER_KEY: ${{ secrets.CAREER_KEY }} ACCESS_EXP: ${{ secrets.ACCESS_EXP }} REFRESH_EXP: ${{ secrets.REFRESH_EXP }} + DB_URL: ${{ secrets.DB_URL }} + DB_USERNAME: ${{ secrets.DB_USERNAME }} + DB_PASSWORD: ${{ secrets.PASSWORD }} steps: - uses: actions/checkout@v3 From 2f52ab63e39308c3194ae6dffe3453be18606668 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Tue, 3 Dec 2024 17:11:07 +0900 Subject: [PATCH 13/15] refactor --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a5f4a87..389db5c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - kotlin("jvm") version "1.6.21" - kotlin("plugin.spring") version "1.9.25" + kotlin("jvm") version "1.9.24" + kotlin("plugin.spring") version "1.9.24" + kotlin("plugin.jpa") version "1.9.25" id("org.springframework.boot") version "2.7.16" id("io.spring.dependency-management") version "1.1.6" id("org.jlleitschuh.gradle.ktlint") version "11.5.1" - kotlin("plugin.jpa") version "1.6.21" } group = "org.meogo" From 2bfb02d4f1cf2900d5d13a3a85eb5eebfa638244 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Wed, 4 Dec 2024 22:24:29 +0900 Subject: [PATCH 14/15] hoo --- build.gradle.kts | 2 +- .../org/meogo/domain/bookmark/service/BookmarkServiceTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 389db5c..ad8d09f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") version "1.9.24" kotlin("plugin.spring") version "1.9.24" - kotlin("plugin.jpa") version "1.9.25" + kotlin("plugin.jpa") version "1.9.24" id("org.springframework.boot") version "2.7.16" id("io.spring.dependency-management") version "1.1.6" id("org.jlleitschuh.gradle.ktlint") version "11.5.1" diff --git a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt index ff3f701..16b8c32 100644 --- a/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt +++ b/src/test/kotlin/org/meogo/domain/bookmark/service/BookmarkServiceTest.kt @@ -50,7 +50,7 @@ class BookmarkServiceTest { @Test fun `북마크 저장`() { - // given & then + // given & when bookmarkService.execute(schoolId) // then From 9dd8c38d78ca4b4299397c661c9e095202a31bcc Mon Sep 17 00:00:00 2001 From: soohyeon Date: Wed, 4 Dec 2024 22:42:22 +0900 Subject: [PATCH 15/15] retest --- .github/workflows/git-action-main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/git-action-main.yml b/.github/workflows/git-action-main.yml index 0e1075f..5634c9c 100644 --- a/.github/workflows/git-action-main.yml +++ b/.github/workflows/git-action-main.yml @@ -2,9 +2,9 @@ name: meogo-main on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] + branches: ["main"] workflow_dispatch: jobs: @@ -38,9 +38,8 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: | - build - --build-cache + clean build --no-daemon - name: Run tests with verbose output - run: ./gradlew test -i + run: ./gradlew test --debug