Small fixes

VovaStelmashchuk · Aug 15, 2024 · d5b6fc7 · d5b6fc7
1 parent 4aeddc5
commit d5b6fc7
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 14 deletions.
diff --git a/backend/src/main/java/com/nestapp/Configuration.kt b/backend/src/main/java/com/nestapp/Configuration.kt
@@ -8,6 +8,5 @@ class Configuration(
     val accessKey: String,
     val secretKey: String,
     val mongoUrl: String,
+    val jaguarUrl: String,
 )
-
-const val TOLERANCE = 1e-2
diff --git a/backend/src/main/java/com/nestapp/Main.kt b/backend/src/main/java/com/nestapp/Main.kt
@@ -26,6 +26,7 @@ internal object Main {
                     accessKey = config.property("ktor.minio.access_key").getString(),
                     secretKey = config.property("ktor.minio.secret_key").getString(),
                     mongoUrl = config.property("ktor.mongo.url").getString(),
+                    jaguarUrl = config.property("ktor.jaguar.url").getString(),
                 )
 
                 val appComponent = AppComponent(

diff --git a/backend/src/main/java/com/nestapp/RestController.kt b/backend/src/main/java/com/nestapp/RestController.kt
@@ -95,7 +95,7 @@ fun Route.setupRouter(
     )
 
     nestRestApi(
-        jaguarRequest = JaguarRequest(client),
+        jaguarRequest = JaguarRequest(client, appComponent.configuration),
         polygonGenerator = PolygonGenerator(),
         minioProjectRepository = appComponent.minioProjectRepository,
         nestHistoryRepository = appComponent.nestHistoryRepository,

diff --git a/backend/src/main/java/com/nestapp/mongo/NestHistoryRepository.kt b/backend/src/main/java/com/nestapp/mongo/NestHistoryRepository.kt
@@ -35,6 +35,8 @@ class NestHistoryRepository(
                 .append("svgPreviewUrl", svgPath)
                 .append("dxfFileUrl", dxfPath)
         )
+
+        collection.updateOne(query, update)
     }
 }
 

diff --git a/backend/src/main/java/com/nestapp/nest/NestRestApi.kt b/backend/src/main/java/com/nestapp/nest/NestRestApi.kt
@@ -65,11 +65,22 @@ fun Route.nestRestApi(
                 }
 
                 is NestResult.Success -> {
-                    buildResultFiles(
+                    val result = buildResultFiles(
                         nestedResult = nestedResult,
                         nestId = nestResultDatabase.id,
                         minioFileUpload = minioFileUpload,
-                        configuration = configuration,
+                    )
+
+                    nestHistoryRepository.makeNestFinish(
+                        id = nestResultDatabase.id,
+                        svgPath = result.svg,
+                        dxfPath = result.dxf,
+                    )
+
+                    NestedOutput(
+                        id = nestResultDatabase.id.toHexString(),
+                        svg = "${configuration.baseUrl}files/${result.svg}",
+                        dxf = "${configuration.baseUrl}files/${result.dxf}",
                     )
                 }
             }
@@ -84,8 +95,7 @@ fun Route.nestRestApi(
 private fun buildResultFiles(
     nestedResult: NestResult.Success,
     nestId: ObjectId,
-    minioFileUpload: MinioFileUpload,
-    configuration: Configuration
+    minioFileUpload: MinioFileUpload
 ): NestedOutput {
     val svgPolygons = nestedResult.polygons.flatMap { nestedPolygon ->
         PolygonGenerator().convertEntitiesToPolygons(nestedPolygon.closePolygon.entities, 0.1).map {
@@ -122,8 +132,8 @@ private fun buildResultFiles(
 
     return NestedOutput(
         id = nestId.toHexString(),
-        svg = "${configuration.baseUrl}files/$svgPath",
-        dxf = "${configuration.baseUrl}files/$dxfPath",
+        svg = svgPath,
+        dxf = dxfPath,
     )
 }
 

diff --git a/backend/src/main/java/com/nestapp/nest/Utlis.kt b/backend/src/main/java/com/nestapp/nest/Utlis.kt
@@ -1,6 +1,5 @@
 package com.nestapp.nest
 
-import com.nestapp.TOLERANCE
 import com.nestapp.nest.config.Config
 import de.lighti.clipper.Clipper
 import de.lighti.clipper.ClipperOffset

diff --git a/backend/src/main/java/com/nestapp/nest/jaguar/JaguarRequest.kt b/backend/src/main/java/com/nestapp/nest/jaguar/JaguarRequest.kt
@@ -1,15 +1,14 @@
 package com.nestapp.nest.jaguar
 
+import com.nestapp.Configuration
 import com.nestapp.nest.ClosePolygon
 import com.nestapp.nest.polygonOffset
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.plugins.timeout
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
-import java.util.concurrent.TimeUnit
 
 sealed class NestResult {
 
@@ -42,14 +41,16 @@ data class JaguarNestInput(
 
 class JaguarRequest(
     private val client: HttpClient,
+    private val configuration: Configuration,
 ) {
     suspend fun makeNestByJaguar(
         jaguarNestInput: JaguarNestInput,
     ): NestResult {
         val request = buildRequest(jaguarNestInput)
 
         return try {
-            val response = client.post("https://jagua.nest2d.online/run/") {
+            println("JaguarRequest request $jaguarNestInput")
+            val response = client.post("${configuration.jaguarUrl}run/") {
                 contentType(ContentType.Application.Json)
                 setBody(request)
             }.body<Response>()
@@ -70,7 +71,7 @@ class JaguarRequest(
                 NestResult.NotFit
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            System.err.println("JaguarRequest error: $e")
             throw e
         }
     }

diff --git a/backend/src/main/resources/application.conf b/backend/src/main/resources/application.conf
@@ -16,4 +16,7 @@ ktor {
     mongo {
         url = ${NEST2D_MONGO_URL}
     }
+    jaguar {
+        url = ${NEST2D_JAGUAR_URL}
+    }
 }