Actions (#15)

.github/workflows/lint.yml

@@ -3,10 +3,12 @@ name: Kotlin Lint Check
 on:
   push:
     branches:
+      - actions
       - main
       - develop
   pull_request:
     branches:
+      - actions
       - main
       - develop
 
@@ -18,14 +20,39 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      # 1. Docker 및 Docker Compose 설치
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
+      # 2. Docker Compose로 DB 시작
+      - name: Start Database with Docker Compose
+        run: |
+          docker-compose up -d mysql
+        working-directory: .
+
+      # 3. DB 준비 시간 대기
+      - name: Wait for Database
+        run: |
+          until nc -z localhost 3306; do
+            echo "Waiting for the database to be ready..."
+            sleep 5
+          done
+
+      # 4. Java 환경 설정
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
-          distribution: 'amazon-corretto'# 필요한 Java 버전 설정
-
-      - name: Install dependencies
-        run: ./gradlew clean build  # Gradle 의존성 설치 및 빌드
+          distribution: 'corretto'
 
+      # 5. Gradle 의존성 설치 및 Ktlint 검사 실행
       - name: Run Ktlint
-        run: ./gradlew ktlintCheck  # Ktlint 검사 실행
+        run: ./gradlew ktlintCheck
+
+      # 6. Docker Compose 정리
+      - name: Stop Database
+        run: |
+          docker-compose down
+        working-directory: .

build.gradle.kts

@@ -1,51 +1,52 @@
 plugins {
-	kotlin("jvm") version "1.9.25"
-	kotlin("plugin.spring") version "1.9.25"
-	id("org.springframework.boot") version "3.4.1"
-	id("io.spring.dependency-management") version "1.1.7"
-	kotlin("plugin.jpa") version "1.9.25"
+    kotlin("jvm") version "1.9.25"
+    kotlin("plugin.spring") version "1.9.25"
+    id("org.springframework.boot") version "3.4.1"
+    id("io.spring.dependency-management") version "1.1.7"
+    id("org.jlleitschuh.gradle.ktlint") version "11.5.1"
+    kotlin("plugin.jpa") version "1.9.25"
 }
 
 group = "com.wafflestudio.toyproject"
 version = "0.0.1-SNAPSHOT"
 
 java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
-	}
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter")
-	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-	implementation("org.springframework.boot:spring-boot-starter-web")
-	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	implementation("org.mindrot:jbcrypt:0.4")
-	implementation("com.mysql:mysql-connector-j:8.2.0")
-	implementation("io.jsonwebtoken:jjwt-api:0.11.5")
-	implementation("io.jsonwebtoken:jjwt-impl:0.11.5")
-	implementation("io.jsonwebtoken:jjwt-jackson:0.11.5")
-	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
+    implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    implementation("org.mindrot:jbcrypt:0.4")
+    implementation("com.mysql:mysql-connector-j:8.2.0")
+    implementation("io.jsonwebtoken:jjwt-api:0.11.5")
+    implementation("io.jsonwebtoken:jjwt-impl:0.11.5")
+    implementation("io.jsonwebtoken:jjwt-jackson:0.11.5")
+    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 kotlin {
-	compilerOptions {
-		freeCompilerArgs.addAll("-Xjsr305=strict")
-	}
+    compilerOptions {
+        freeCompilerArgs.addAll("-Xjsr305=strict")
+    }
 }
 
 allOpen {
-	annotation("jakarta.persistence.Entity")
-	annotation("jakarta.persistence.MappedSuperclass")
-	annotation("jakarta.persistence.Embeddable")
+    annotation("jakarta.persistence.Entity")
+    annotation("jakarta.persistence.MappedSuperclass")
+    annotation("jakarta.persistence.Embeddable")
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }

src/main/kotlin/com/wafflestudio/toyproject/memo_with_tags/MemoWithTagsApplication.kt → src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/MemoWithTagsApplication.kt

@@ -1,4 +1,4 @@
-package com.wafflestudio.toyproject.memo_with_tags
+package com.wafflestudio.toyproject.memoWithTags
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
@@ -7,5 +7,5 @@ import org.springframework.boot.runApplication
 class MemoWithTagsApplication
 
 fun main(args: Array<String>) {
-	runApplication<MemoWithTagsApplication>(*args)
+    runApplication<MemoWithTagsApplication>(*args)
 }

src/main/kotlin/com/wafflestudio/toyproject/memo_with_tags/memo/controller/MemoController.kt → src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/memo/controller/MemoController.kt

@@ -1,21 +1,26 @@
-package com.wafflestudio.toyproject.memo_with_tags.memo.controller
+package com.wafflestudio.toyproject.memoWithTags.memo.controller
 
-import com.wafflestudio.toyproject.memo_with_tags.memo.service.MemoService
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestParam
+import com.wafflestudio.toyproject.memoWithTags.memo.service.MemoService
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.PathVariable
+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.time.Instant
 
 @RestController
 class MemoController(
     private val memoService: MemoService
 ) {
     @PostMapping("/api/v1/memo")
-    fun createMemo(@RequestBody request: CreateMemoRequest): MemoDto {
+    fun createMemo(@RequestBody request: CreateMemoResponse): MemoDto {
+        return MemoDto("", emptyList())
     }
 
     @PutMapping("/api/v1/memo/{memoId}")
-    fun updateMemo(@PathVariable memoId: Long, @RequestBody request: UpdateMemoRequest): MemoDto {
+    fun updateMemo(@PathVariable memoId: Long, @RequestBody request: UpdateMemoResponse): MemoDto {
+        return MemoDto("", emptyList())
     }
 
     @DeleteMapping("/api/v1/memo/{memoId}")
@@ -42,4 +47,4 @@ data class UpdateMemoResponse(
     val tags: List<Long>,
     val createdAt: Instant,
     val updatedAt: Instant
-)
+)

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/memo/persistence/MemoEntity.kt

@@ -0,0 +1,3 @@
+package com.wafflestudio.toyproject.memoWithTags.memo.persistence
+
+class MemoEntity

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/memo/service/MemoService.kt

@@ -0,0 +1,6 @@
+package com.wafflestudio.toyproject.memoWithTags.memo.service
+
+import org.springframework.stereotype.Service
+
+@Service
+class MemoService

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/tag/controller/TagController.kt

@@ -0,0 +1,51 @@
+package com.wafflestudio.toyproject.memoWithTags.tag.controller
+
+import com.wafflestudio.toyproject.memoWithTags.tag.service.TagService
+import org.springframework.web.bind.annotation.DeleteMapping
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+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
+
+@RestController
+class TagController(
+    private val tagService: TagService
+) {
+    @GetMapping("/api/v1/tag")
+    fun getTags(): List<TagDto> {
+        return emptyList() // 빈 리스트 반환
+    }
+
+    @PostMapping("/api/v1/tag")
+    fun createTag(@RequestBody request: CreateTagRequest): TagDto {
+        return TagDto(0L, "", "") // 기본값으로 TagDto 반환
+    }
+
+    @PutMapping("/api/v1/tag/{tagId}")
+    fun updateTag(@PathVariable id: Long, @RequestBody request: UpdateTagRequest): TagDto {
+        return TagDto(0L, "", "") // 기본값으로 TagDto 반환
+    }
+
+    @DeleteMapping("/api/v1/tag/{tagId}")
+    fun deleteTag(@PathVariable id: Long) {
+        // 반환 타입이 Unit이므로 아무 작업 없이 비워 둬도 OK
+    }
+}
+
+data class TagDto(
+    val id: Long,
+    val name: String,
+    val color: String
+)
+
+data class CreateTagRequest(
+    val name: String,
+    val color: String
+)
+
+data class UpdateTagRequest(
+    val name: String,
+    val color: String
+)

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/tag/persistence/TagEntity.kt

@@ -0,0 +1,3 @@
+package com.wafflestudio.toyproject.memoWithTags.tag.persistence
+
+class TagEntity

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/tag/service/TagService.kt

@@ -0,0 +1,6 @@
+package com.wafflestudio.toyproject.memoWithTags.tag.service
+
+import org.springframework.stereotype.Service
+
+@Service
+class TagService

src/main/kotlin/com/wafflestudio/toyproject/memo_with_tags/user/contoller/UserController.kt → src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/user/contoller/UserController.kt

@@ -1,44 +1,47 @@
-package com.wafflestudio.toyproject.memo_with_tags.user.contoller
+package com.wafflestudio.toyproject.memoWithTags.user.controller
+
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class UserController(
+class UserController {
 
-) {
     @GetMapping("/api/v1/auth/register")
     fun register(@RequestBody request: RegisterRequest): RegisterResponse {
-
+        return RegisterResponse("", "", 0L) // 기본값으로 RegisterResponse 반환
     }
 
     @PostMapping("/api/v1/auth/login")
     fun login(@RequestBody request: LoginRequest): LoginResponse {
-
+        return LoginResponse("", "", 0L) // 기본값으로 LoginResponse 반환
     }
 
     @PostMapping("/api/v1/auth/logout")
     fun logout(@RequestBody request: LogoutRequest) {
-
+        // 반환 타입이 Unit이므로 아무 작업 없이 비워 둬도 OK
     }
 
     @PostMapping("/api/v1/auth/verify-email")
     fun verifyEmail(@RequestBody request: VerifyEmailRequest) {
-
+        // 반환 타입이 Unit이므로 아무 작업 없이 비워 둬도 OK
     }
 
     @PostMapping("/api/v1/auth/forgot-password")
     fun forgotPassword(@RequestBody request: ForgotPasswordRequest) {
-
+        // 반환 타입이 Unit이므로 아무 작업 없이 비워 둬도 OK
     }
 
     @PostMapping("/api/v1/auth/reset-password")
     fun resetPassword(@RequestBody request: ResetPasswordRequest) {
-
+        // 반환 타입이 Unit이므로 아무 작업 없이 비워 둬도 OK
     }
 
     @PostMapping("/api/v1/auth/refresh-token")
     fun refreshToken(): RefreshTokenResponse {
-
+        return RefreshTokenResponse("", "", 0L) // 기본값으로 RefreshTokenResponse 반환
     }
-
 }
 
 data class RegisterRequest(

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/user/persistence/UserEntity.kt

@@ -0,0 +1,3 @@
+package com.wafflestudio.toyproject.memoWithTags.user.persistence
+
+class UserEntity

src/main/kotlin/com/wafflestudio/toyproject/memoWithTags/user/service/UserService.kt

@@ -0,0 +1,3 @@
+package com.wafflestudio.toyproject.memoWithTags.user.service
+
+class UserService