Lab 4 (revised)

.gitignore

@@ -42,4 +42,8 @@ out/
 ### Python ###
 .venv
 
-.env
+.env
+_workflow.md
+_workflow.log
+_state.json
+run_workflow.py

config-server/src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
       server:
         git:
           uri: https://github.com/butvinm-itmo/highload-config.git
-          default-label: revert-to-lab3
+          default-label: main
           clone-on-start: true
           timeout: 10
 

divination-service/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-config")
     implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client")
     implementation("org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j")
+    implementation("org.springframework.kafka:spring-kafka")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.flywaydb:flyway-core")
     implementation("org.flywaydb:flyway-database-postgresql")

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/api/controller/InternalController.kt

@@ -0,0 +1,37 @@
+package com.github.butvinmitmo.divinationservice.api.controller
+
+import com.github.butvinmitmo.divinationservice.application.service.DivinationService
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+/**
+ * Internal API controller for service-to-service communication.
+ * These endpoints are not exposed through the gateway and are only accessible
+ * via Eureka service discovery for internal operations.
+ */
+@RestController
+@RequestMapping("/internal")
+class InternalController(
+    private val divinationService: DivinationService,
+) {
+    /**
+     * Gets the author (owner) ID of a spread.
+     * Called by notification-service to determine who should receive notifications.
+     *
+     * @param spreadId The ID of the spread
+     * @return 200 OK with author UUID, or 404 if spread not found
+     */
+    @GetMapping("/spreads/{spreadId}/owner")
+    fun getSpreadOwner(
+        @PathVariable spreadId: UUID,
+    ): Mono<ResponseEntity<UUID>> =
+        divinationService
+            .getSpreadAuthorId(spreadId)
+            .map { ResponseEntity.ok(it) }
+            .defaultIfEmpty(ResponseEntity.notFound().build())
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/controller/InterpretationController.kt → divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/api/controller/InterpretationController.kt

@@ -1,6 +1,6 @@
-package com.github.butvinmitmo.divinationservice.controller
+package com.github.butvinmitmo.divinationservice.api.controller
 
-import com.github.butvinmitmo.divinationservice.service.DivinationService
+import com.github.butvinmitmo.divinationservice.application.service.DivinationService
 import com.github.butvinmitmo.shared.dto.CreateInterpretationRequest
 import com.github.butvinmitmo.shared.dto.CreateInterpretationResponse
 import com.github.butvinmitmo.shared.dto.InterpretationDto
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Mono
 import java.util.UUID
 
 @RestController
@@ -83,7 +84,7 @@ class InterpretationController(
         @Min(1)
         @Max(50)
         size: Int,
-    ): reactor.core.publisher.Mono<ResponseEntity<List<InterpretationDto>>> =
+    ): Mono<ResponseEntity<List<InterpretationDto>>> =
         divinationService
             .getInterpretations(spreadId, page, size)
             .map { response ->
@@ -123,7 +124,7 @@ class InterpretationController(
         @Parameter(description = "Interpretation ID", required = true)
         @PathVariable
         id: UUID,
-    ): reactor.core.publisher.Mono<ResponseEntity<InterpretationDto>> =
+    ): Mono<ResponseEntity<InterpretationDto>> =
         divinationService
             .getInterpretation(spreadId, id)
             .map { interpretation -> ResponseEntity.ok(interpretation) }
@@ -199,10 +200,12 @@ class InterpretationController(
         @PathVariable
         spreadId: UUID,
         @Valid @RequestBody request: CreateInterpretationRequest,
-    ): reactor.core.publisher.Mono<ResponseEntity<CreateInterpretationResponse>> =
+    ): Mono<ResponseEntity<CreateInterpretationResponse>> =
         divinationService
-            .addInterpretation(spreadId, request)
-            .map { response -> ResponseEntity.status(HttpStatus.CREATED).body(response) }
+            .addInterpretation(spreadId, request.text, request.uploadId)
+            .map { result ->
+                ResponseEntity.status(HttpStatus.CREATED).body(CreateInterpretationResponse(id = result.id))
+            }
 
     @PutMapping("/{id}")
     @Operation(
@@ -265,9 +268,9 @@ class InterpretationController(
         @PathVariable
         id: UUID,
         @Valid @RequestBody request: UpdateInterpretationRequest,
-    ): reactor.core.publisher.Mono<ResponseEntity<InterpretationDto>> =
+    ): Mono<ResponseEntity<InterpretationDto>> =
         divinationService
-            .updateInterpretation(spreadId, id, request)
+            .updateInterpretation(spreadId, id, request.text)
             .map { updatedInterpretation -> ResponseEntity.ok(updatedInterpretation) }
 
     @DeleteMapping("/{id}")
@@ -314,11 +317,8 @@ class InterpretationController(
         @Parameter(description = "Interpretation ID to delete", required = true)
         @PathVariable
         id: UUID,
-    ): reactor.core.publisher.Mono<ResponseEntity<Void>> =
+    ): Mono<ResponseEntity<Void>> =
         divinationService
             .deleteInterpretation(spreadId, id)
-            .then(
-                reactor.core.publisher.Mono
-                    .just(ResponseEntity.noContent().build()),
-            )
+            .then(Mono.just(ResponseEntity.noContent().build()))
 }

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/controller/SpreadController.kt → divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/api/controller/SpreadController.kt

@@ -1,6 +1,6 @@
-package com.github.butvinmitmo.divinationservice.controller
+package com.github.butvinmitmo.divinationservice.api.controller
 
-import com.github.butvinmitmo.divinationservice.service.DivinationService
+import com.github.butvinmitmo.divinationservice.application.service.DivinationService
 import com.github.butvinmitmo.shared.dto.CreateSpreadRequest
 import com.github.butvinmitmo.shared.dto.CreateSpreadResponse
 import com.github.butvinmitmo.shared.dto.SpreadDto
@@ -88,8 +88,8 @@ class SpreadController(
         @Valid @RequestBody request: CreateSpreadRequest,
     ): Mono<ResponseEntity<CreateSpreadResponse>> =
         divinationService
-            .createSpread(request)
-            .map { response -> ResponseEntity.status(HttpStatus.CREATED).body(response) }
+            .createSpread(request.question, request.layoutTypeId)
+            .map { result -> ResponseEntity.status(HttpStatus.CREATED).body(CreateSpreadResponse(id = result.id)) }
 
     @GetMapping
     @Operation(

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/provider/CardProvider.kt

@@ -0,0 +1,24 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.provider
+
+import com.github.butvinmitmo.shared.dto.CardDto
+import com.github.butvinmitmo.shared.dto.LayoutTypeDto
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface CardProvider {
+    fun getLayoutTypeById(
+        requesterId: UUID,
+        requesterRole: String,
+        layoutTypeId: UUID,
+    ): Mono<LayoutTypeDto>
+
+    fun getRandomCards(
+        requesterId: UUID,
+        requesterRole: String,
+        count: Int,
+    ): Mono<List<CardDto>>
+
+    fun getAllCards(): Mono<List<CardDto>>
+
+    fun getSystemLayoutType(layoutTypeId: UUID): Mono<LayoutTypeDto>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/provider/CurrentUserProvider.kt

@@ -0,0 +1,12 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.provider
+
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface CurrentUserProvider {
+    fun getCurrentUserId(): Mono<UUID>
+
+    fun getCurrentRole(): Mono<String>
+
+    fun canModify(authorId: UUID): Mono<Boolean>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/provider/FileProvider.kt

@@ -0,0 +1,39 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.provider
+
+import com.github.butvinmitmo.shared.dto.FileUploadMetadataDto
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+/**
+ * Provider interface for file operations via files-service.
+ * Used to verify uploads, get metadata, and generate download URLs.
+ */
+interface FileProvider {
+    /**
+     * Verifies that an upload exists, belongs to the user, and marks it as completed.
+     *
+     * @param uploadId The ID of the upload to verify
+     * @param userId The ID of the user who should own the upload
+     * @return File metadata if verification succeeds
+     */
+    fun verifyAndCompleteUpload(
+        uploadId: UUID,
+        userId: UUID,
+    ): Mono<FileUploadMetadataDto>
+
+    /**
+     * Gets metadata for a completed file upload.
+     *
+     * @param uploadId The ID of the upload
+     * @return File metadata
+     */
+    fun getUploadMetadata(uploadId: UUID): Mono<FileUploadMetadataDto>
+
+    /**
+     * Gets a presigned download URL for a file.
+     *
+     * @param uploadId The ID of the upload
+     * @return Presigned download URL
+     */
+    fun getDownloadUrl(uploadId: UUID): Mono<String>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/provider/UserProvider.kt

@@ -0,0 +1,15 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.provider
+
+import com.github.butvinmitmo.shared.dto.UserDto
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface UserProvider {
+    fun getUserById(
+        requesterId: UUID,
+        requesterRole: String,
+        userId: UUID,
+    ): Mono<UserDto>
+
+    fun getSystemUser(userId: UUID): Mono<UserDto>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/publisher/InterpretationEventPublisher.kt

@@ -0,0 +1,12 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.publisher
+
+import com.github.butvinmitmo.divinationservice.domain.model.Interpretation
+import reactor.core.publisher.Mono
+
+interface InterpretationEventPublisher {
+    fun publishCreated(interpretation: Interpretation): Mono<Void>
+
+    fun publishUpdated(interpretation: Interpretation): Mono<Void>
+
+    fun publishDeleted(interpretation: Interpretation): Mono<Void>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/publisher/SpreadEventPublisher.kt

@@ -0,0 +1,10 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.publisher
+
+import com.github.butvinmitmo.divinationservice.domain.model.Spread
+import reactor.core.publisher.Mono
+
+interface SpreadEventPublisher {
+    fun publishCreated(spread: Spread): Mono<Void>
+
+    fun publishDeleted(spread: Spread): Mono<Void>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/repository/InterpretationAttachmentRepository.kt

@@ -0,0 +1,18 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.repository
+
+import com.github.butvinmitmo.divinationservice.domain.model.InterpretationAttachment
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface InterpretationAttachmentRepository {
+    fun save(attachment: InterpretationAttachment): Mono<InterpretationAttachment>
+
+    fun findByInterpretationId(interpretationId: UUID): Mono<InterpretationAttachment>
+
+    fun findByInterpretationIds(interpretationIds: List<UUID>): Flux<InterpretationAttachment>
+
+    fun deleteByInterpretationId(interpretationId: UUID): Mono<Void>
+
+    fun existsByInterpretationId(interpretationId: UUID): Mono<Boolean>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/repository/InterpretationRepository.kt

@@ -0,0 +1,31 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.repository
+
+import com.github.butvinmitmo.divinationservice.domain.model.Interpretation
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface InterpretationRepository {
+    fun save(interpretation: Interpretation): Mono<Interpretation>
+
+    fun findById(id: UUID): Mono<Interpretation>
+
+    fun findBySpreadIdOrderByCreatedAtDesc(
+        spreadId: UUID,
+        offset: Long,
+        limit: Int,
+    ): Flux<Interpretation>
+
+    fun existsByAuthorAndSpread(
+        authorId: UUID,
+        spreadId: UUID,
+    ): Mono<Boolean>
+
+    fun countBySpreadId(spreadId: UUID): Mono<Long>
+
+    fun countBySpreadIds(spreadIds: List<UUID>): Flux<Pair<UUID, Long>>
+
+    fun deleteById(id: UUID): Mono<Void>
+
+    fun deleteByAuthorId(authorId: UUID): Mono<Void>
+}

divination-service/src/main/kotlin/com/github/butvinmitmo/divinationservice/application/interfaces/repository/SpreadCardRepository.kt

@@ -0,0 +1,12 @@
+package com.github.butvinmitmo.divinationservice.application.interfaces.repository
+
+import com.github.butvinmitmo.divinationservice.domain.model.SpreadCard
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import java.util.UUID
+
+interface SpreadCardRepository {
+    fun save(spreadCard: SpreadCard): Mono<SpreadCard>
+
+    fun findBySpreadId(spreadId: UUID): Flux<SpreadCard>
+}