vityaman-edu · vityaman · Mar 28, 2024 · Mar 28, 2024 · Mar 28, 2024
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -3,7 +3,7 @@ name: Gradle Build Check
 on:
   pull_request:
     paths:
-      - "gateway/**"
+      - "botalka/**"
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -21,4 +21,4 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Build Gateway
-        run: (cd gateway && ./gradlew :build)
+        run: (cd botalka && ./gradlew :build)
diff --git a/gateway/.gitignore → botalka/.gitignore b/gateway/.gitignore → botalka/.gitignore
diff --git a/gateway/build.gradle.kts → botalka/build.gradle.kts b/gateway/build.gradle.kts → botalka/build.gradle.kts
@@ -24,7 +24,7 @@ group = "ru.itmo"
 version = "0.0.1"
 
 val jvmTarget = "21"
-val basePackage = "$group.lms.gateway"
+val basePackage = "$group.lms.botalka"
 
 val jooqVersion = "3.19.6"
 val testcontainersVersion = "1.19.7"
@@ -180,7 +180,7 @@ koverReport {
         excludes {
             classes(
                 "$basePackage.api.http.apis.*",
-                "$basePackage.GatewayApplicationKt",
+                "$basePackage.BotalkaApplicationKt",
                 "$basePackage.storage.jooq.**",
             )
         }

diff --git a/gateway/docker-compose.yml → botalka/docker-compose.yml b/gateway/docker-compose.yml → botalka/docker-compose.yml
diff --git a/gateway/gradle/wrapper/gradle-wrapper.jar → botalka/gradle/wrapper/gradle-wrapper.jar b/gateway/gradle/wrapper/gradle-wrapper.jar → botalka/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gateway/gradlew → botalka/gradlew b/gateway/gradlew → botalka/gradlew
diff --git a/gateway/gradlew.bat → botalka/gradlew.bat b/gateway/gradlew.bat → botalka/gradlew.bat
diff --git a/botalka/settings.gradle.kts b/botalka/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "botalka"
diff --git a/...ru/itmo/lms/gateway/GatewayApplication.kt → ...ru/itmo/lms/botalka/BotalkaApplication.kt b/...ru/itmo/lms/gateway/GatewayApplication.kt → ...ru/itmo/lms/botalka/BotalkaApplication.kt
@@ -1,16 +1,12 @@
-package ru.itmo.lms.gateway
+package ru.itmo.lms.botalka
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration
 import org.springframework.boot.runApplication
 
-@SpringBootApplication(
-    exclude = [
-        JooqAutoConfiguration::class,
-    ],
-)
-class GatewayApplication
+@SpringBootApplication(exclude = [JooqAutoConfiguration::class])
+class BotalkaApplication
 
 fun main(args: Array<String>) {
-    runApplication<GatewayApplication>(args = args)
+    runApplication<BotalkaApplication>(args = args)
 }
diff --git a/...ay/api/http/endpoint/MonitoringHttpApi.kt → ...ka/api/http/endpoint/MonitoringHttpApi.kt b/...ay/api/http/endpoint/MonitoringHttpApi.kt → ...ka/api/http/endpoint/MonitoringHttpApi.kt
@@ -1,8 +1,8 @@
-package ru.itmo.lms.gateway.api.http.endpoint
+package ru.itmo.lms.botalka.api.http.endpoint
 
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController
-import ru.itmo.lms.gateway.api.http.apis.MonitoringApi
+import ru.itmo.lms.botalka.api.http.apis.MonitoringApi
 
 @RestController
 class MonitoringHttpApi : MonitoringApi {

diff --git a/...gateway/api/http/endpoint/NotesHttpApi.kt → ...botalka/api/http/endpoint/NotesHttpApi.kt b/...gateway/api/http/endpoint/NotesHttpApi.kt → ...botalka/api/http/endpoint/NotesHttpApi.kt
@@ -1,16 +1,16 @@
-package ru.itmo.lms.gateway.api.http.endpoint
+package ru.itmo.lms.botalka.api.http.endpoint
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController
-import ru.itmo.lms.gateway.api.http.NoteDraftMessage
-import ru.itmo.lms.gateway.api.http.NoteMessage
-import ru.itmo.lms.gateway.api.http.apis.NotesApi
-import ru.itmo.lms.gateway.api.http.message.toMessage
-import ru.itmo.lms.gateway.api.http.message.toModel
-import ru.itmo.lms.gateway.logic.NoteService
+import ru.itmo.lms.botalka.api.http.NoteDraftMessage
+import ru.itmo.lms.botalka.api.http.NoteMessage
+import ru.itmo.lms.botalka.api.http.apis.NotesApi
+import ru.itmo.lms.botalka.api.http.message.toMessage
+import ru.itmo.lms.botalka.api.http.message.toModel
+import ru.itmo.lms.botalka.logic.NoteService
 
 @RestController
 class NotesHttpApi(

diff --git a/...s/gateway/api/http/message/NoteMapping.kt → ...s/botalka/api/http/message/NoteMapping.kt b/...s/gateway/api/http/message/NoteMapping.kt → ...s/botalka/api/http/message/NoteMapping.kt
@@ -1,8 +1,8 @@
-package ru.itmo.lms.gateway.api.http.message
+package ru.itmo.lms.botalka.api.http.message
 
-import ru.itmo.lms.gateway.api.http.NoteDraftMessage
-import ru.itmo.lms.gateway.api.http.NoteMessage
-import ru.itmo.lms.gateway.domain.model.Note
+import ru.itmo.lms.botalka.api.http.NoteDraftMessage
+import ru.itmo.lms.botalka.api.http.NoteMessage
+import ru.itmo.lms.botalka.domain.model.Note
 
 fun Note.toMessage(): NoteMessage =
     NoteMessage(

diff --git a/.../ru/itmo/lms/gateway/domain/model/Note.kt → .../ru/itmo/lms/botalka/domain/model/Note.kt b/.../ru/itmo/lms/gateway/domain/model/Note.kt → .../ru/itmo/lms/botalka/domain/model/Note.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway.domain.model
+package ru.itmo.lms.botalka.domain.model
 
 data class Note(
     val id: Id,

diff --git a/.../ru/itmo/lms/gateway/logic/NoteService.kt → .../ru/itmo/lms/botalka/logic/NoteService.kt b/.../ru/itmo/lms/gateway/logic/NoteService.kt → .../ru/itmo/lms/botalka/logic/NoteService.kt
@@ -1,7 +1,7 @@
-package ru.itmo.lms.gateway.logic
+package ru.itmo.lms.botalka.logic
 
 import kotlinx.coroutines.flow.Flow
-import ru.itmo.lms.gateway.domain.model.Note
+import ru.itmo.lms.botalka.domain.model.Note
 
 interface NoteService {
     fun getAll(): Flow<Note>

diff --git a/...s/gateway/logic/basic/BasicNoteService.kt → ...s/botalka/logic/basic/BasicNoteService.kt b/...s/gateway/logic/basic/BasicNoteService.kt → ...s/botalka/logic/basic/BasicNoteService.kt
@@ -1,11 +1,11 @@
-package ru.itmo.lms.gateway.logic.basic
+package ru.itmo.lms.botalka.logic.basic
 
 import kotlinx.coroutines.flow.Flow
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
-import ru.itmo.lms.gateway.domain.model.Note
-import ru.itmo.lms.gateway.logic.NoteService
-import ru.itmo.lms.gateway.storage.NoteStorage
+import ru.itmo.lms.botalka.domain.model.Note
+import ru.itmo.lms.botalka.logic.NoteService
+import ru.itmo.lms.botalka.storage.NoteStorage
 
 @Service
 class BasicNoteService(

diff --git a/...u/itmo/lms/gateway/storage/NoteStorage.kt → ...u/itmo/lms/botalka/storage/NoteStorage.kt b/...u/itmo/lms/gateway/storage/NoteStorage.kt → ...u/itmo/lms/botalka/storage/NoteStorage.kt
@@ -1,7 +1,7 @@
-package ru.itmo.lms.gateway.storage
+package ru.itmo.lms.botalka.storage
 
 import kotlinx.coroutines.flow.Flow
-import ru.itmo.lms.gateway.domain.model.Note
+import ru.itmo.lms.botalka.domain.model.Note
 
 interface NoteStorage {
     fun getAll(): Flow<Note>

diff --git a/...s/gateway/storage/jooq/JooqNoteStorage.kt → ...s/botalka/storage/jooq/JooqNoteStorage.kt b/...s/gateway/storage/jooq/JooqNoteStorage.kt → ...s/botalka/storage/jooq/JooqNoteStorage.kt
@@ -1,16 +1,16 @@
-package ru.itmo.lms.gateway.storage.jooq
+package ru.itmo.lms.botalka.storage.jooq
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.reactive.awaitSingle
 import org.jooq.DSLContext
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Repository
-import ru.itmo.lms.gateway.domain.model.Note
-import ru.itmo.lms.gateway.storage.NoteStorage
-import ru.itmo.lms.gateway.storage.jooq.entity.toModel
-import ru.itmo.lms.gateway.storage.jooq.tables.records.NoteRecord
-import ru.itmo.lms.gateway.storage.jooq.tables.references.NOTE
+import ru.itmo.lms.botalka.domain.model.Note
+import ru.itmo.lms.botalka.storage.NoteStorage
+import ru.itmo.lms.botalka.storage.jooq.entity.toModel
+import ru.itmo.lms.botalka.storage.jooq.tables.records.NoteRecord
+import ru.itmo.lms.botalka.storage.jooq.tables.references.NOTE
 
 @Repository
 class JooqNoteStorage(

diff --git a/.../lms/gateway/storage/jooq/JooqReactive.kt → .../lms/botalka/storage/jooq/JooqReactive.kt b/.../lms/gateway/storage/jooq/JooqReactive.kt → .../lms/botalka/storage/jooq/JooqReactive.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway.storage.jooq
+package ru.itmo.lms.botalka.storage.jooq
 
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono

diff --git a/...gateway/storage/jooq/config/JooqConfig.kt → ...botalka/storage/jooq/config/JooqConfig.kt b/...gateway/storage/jooq/config/JooqConfig.kt → ...botalka/storage/jooq/config/JooqConfig.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway.storage.jooq.config
+package ru.itmo.lms.botalka.storage.jooq.config
 
 import io.r2dbc.spi.ConnectionFactory
 import org.jooq.DSLContext

diff --git a/...ateway/storage/jooq/config/R2dbcConfig.kt → ...otalka/storage/jooq/config/R2dbcConfig.kt b/...ateway/storage/jooq/config/R2dbcConfig.kt → ...otalka/storage/jooq/config/R2dbcConfig.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway.storage.jooq.config
+package ru.itmo.lms.botalka.storage.jooq.config
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.r2dbc.config.EnableR2dbcAuditing

diff --git a/...ateway/storage/jooq/entity/NoteMapping.kt → ...otalka/storage/jooq/entity/NoteMapping.kt b/...ateway/storage/jooq/entity/NoteMapping.kt → ...otalka/storage/jooq/entity/NoteMapping.kt
@@ -1,7 +1,7 @@
-package ru.itmo.lms.gateway.storage.jooq.entity
+package ru.itmo.lms.botalka.storage.jooq.entity
 
-import ru.itmo.lms.gateway.domain.model.Note
-import ru.itmo.lms.gateway.storage.jooq.tables.records.NoteRecord
+import ru.itmo.lms.botalka.domain.model.Note
+import ru.itmo.lms.botalka.storage.jooq.tables.records.NoteRecord
 
 fun NoteRecord.toModel(): Note =
     Note(

diff --git a/gateway/src/main/resources/application.yml → botalka/src/main/resources/application.yml b/gateway/src/main/resources/application.yml → botalka/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: gateway
+    name: botalka
   r2dbc:
     url: r2dbc:postgresql://localhost:5432/postgres
     username: postgres

diff --git a/...ay/src/main/resources/database/schema.sql → ...ka/src/main/resources/database/schema.sql b/...ay/src/main/resources/database/schema.sql → ...ka/src/main/resources/database/schema.sql
diff --git a/...src/main/resources/static/openapi/api.yml → ...src/main/resources/static/openapi/api.yml b/...src/main/resources/static/openapi/api.yml → ...src/main/resources/static/openapi/api.yml
@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  title: LMS Gateway
+  title: LMS Botalka
   version: 0.0.1
 servers:
   - url: /api/v1

diff --git a/...tlin/ru/itmo/lms/gateway/BaseTestSuite.kt → ...tlin/ru/itmo/lms/botalka/BaseTestSuite.kt b/...tlin/ru/itmo/lms/gateway/BaseTestSuite.kt → ...tlin/ru/itmo/lms/botalka/BaseTestSuite.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway
+package ru.itmo.lms.botalka
 
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll

diff --git a/...mo/lms/gateway/GatewayApplicationTests.kt → ...mo/lms/botalka/BotalkaApplicationTests.kt b/...mo/lms/gateway/GatewayApplicationTests.kt → ...mo/lms/botalka/BotalkaApplicationTests.kt
@@ -1,10 +1,10 @@
-package ru.itmo.lms.gateway
+package ru.itmo.lms.botalka
 
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
-class GatewayApplicationTests {
+class BotalkaApplicationTests {
     @Test
     fun contextLoads() {
         // Okay

diff --git a/...ay/api/http/endpoint/MonitoringApiTest.kt → ...ka/api/http/endpoint/MonitoringApiTest.kt b/...ay/api/http/endpoint/MonitoringApiTest.kt → ...ka/api/http/endpoint/MonitoringApiTest.kt
@@ -1,4 +1,4 @@
-package ru.itmo.lms.gateway.api.http.endpoint
+package ru.itmo.lms.botalka.api.http.endpoint
 
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test

diff --git a/...gateway/api/http/endpoint/NotesApiTest.kt → ...botalka/api/http/endpoint/NotesApiTest.kt b/...gateway/api/http/endpoint/NotesApiTest.kt → ...botalka/api/http/endpoint/NotesApiTest.kt
@@ -1,14 +1,14 @@
-package ru.itmo.lms.gateway.api.http.endpoint
+package ru.itmo.lms.botalka.api.http.endpoint
 
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import ru.itmo.lms.gateway.BaseTestSuite
-import ru.itmo.lms.gateway.api.http.NoteDraftMessage
-import ru.itmo.lms.gateway.api.http.NoteMessage
+import ru.itmo.lms.botalka.BaseTestSuite
+import ru.itmo.lms.botalka.api.http.NoteDraftMessage
+import ru.itmo.lms.botalka.api.http.NoteMessage
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 

diff --git a/gateway/settings.gradle.kts b/gateway/settings.gradle.kts