fix: change api handler return code

andrea-acampora · andrea-acampora · commit 6c3767150ce8 · 2023-06-02T16:35:52.000+02:00
diff --git a/src/main/kotlin/infrastructure/api/handlers/AdaptEnvironmentHandler.kt b/src/main/kotlin/infrastructure/api/handlers/AdaptEnvironmentHandler.kt
@@ -38,7 +38,7 @@ class AdaptEnvironmentHandler(private val vertx: Vertx) : Handler<RoutingContext
                     "medical-technology-automation-requests-events",
                     Json.encodeToString(event),
                 )
-                routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()
+                routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()
             }
         }
     }
diff --git a/src/main/kotlin/infrastructure/api/handlers/BlockHealthProfessionalTrackingHandler.kt b/src/main/kotlin/infrastructure/api/handlers/BlockHealthProfessionalTrackingHandler.kt
@@ -36,7 +36,9 @@ class BlockHealthProfessionalTrackingHandler(
                 }
                 routingContext.response()
                     .putHeader("content-type", "application/json")
-                    .setStatusCode(HttpResponseStatus.OK.code())
+                    .setStatusCode(
+                        if (list.isNotEmpty()) HttpResponseStatus.OK.code() else HttpResponseStatus.NO_CONTENT.code(),
+                    )
                     .end(Json.encodeToString(block))
             }
         }
diff --git a/src/main/kotlin/infrastructure/api/handlers/CustomScenarioHandler.kt b/src/main/kotlin/infrastructure/api/handlers/CustomScenarioHandler.kt
@@ -40,7 +40,7 @@ class CustomScenarioHandler(private val vertx: Vertx) : Handler<RoutingContext>
                         "automation-requests-events",
                         Json.encodeToString(event),
                     )
-                    routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()
+                    routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()
                 }
             }
         }
diff --git a/src/main/kotlin/infrastructure/api/handlers/RoomInfoHandler.kt b/src/main/kotlin/infrastructure/api/handlers/RoomInfoHandler.kt
@@ -32,10 +32,12 @@ class RoomInfoHandler(
                 provider.webClient,
             ).execute().onSuccess { room ->
                 routingContext.response()
-                    .setStatusCode(HttpResponseStatus.OK.code())
+                    .setStatusCode(
+                        if (room != null) HttpResponseStatus.OK.code() else HttpResponseStatus.NOT_FOUND.code(),
+                    )
                     .putHeader("content-type", "application/json")
                     .end(
-                        Json.encodeToString(room.toRoomDto()),
+                        Json.encodeToString(room?.toRoomDto()),
                     )
             }
         }
diff --git a/src/main/kotlin/infrastructure/api/handlers/StopCustomScenarioHandler.kt b/src/main/kotlin/infrastructure/api/handlers/StopCustomScenarioHandler.kt
@@ -34,7 +34,7 @@ class StopCustomScenarioHandler(private val vertx: Vertx) : Handler<RoutingConte
                 "stop-custom-light-events",
                 Json.encodeToString(event),
             )
-            routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()
+            routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()
         }
     }
 }
diff --git a/src/main/kotlin/infrastructure/api/handlers/SurgeryReportInfoHandler.kt b/src/main/kotlin/infrastructure/api/handlers/SurgeryReportInfoHandler.kt
@@ -31,10 +31,12 @@ class SurgeryReportInfoHandler(
         ).execute().onSuccess { report ->
             routingContext
                 .response()
-                .setStatusCode(HttpResponseStatus.OK.code())
+                .setStatusCode(
+                    if (report != null) HttpResponseStatus.OK.code() else HttpResponseStatus.NOT_FOUND.code(),
+                )
                 .putHeader("content-type", "application/json")
                 .end(
-                    Json.encodeToJsonElement(report.toApiDto()).toString(),
+                    Json.encodeToJsonElement(report?.toApiDto()).toString(),
                 )
         }
     }
diff --git a/src/main/kotlin/infrastructure/api/handlers/SurgeryReportsArchiveHandler.kt b/src/main/kotlin/infrastructure/api/handlers/SurgeryReportsArchiveHandler.kt
@@ -29,7 +29,9 @@ class SurgeryReportsArchiveHandler(
             reports.map { report ->
                 report.toSurgeryReportEntryDto()
             }.run {
-                routingContext.response().setStatusCode(HttpResponseStatus.OK.code())
+                routingContext.response().setStatusCode(
+                    if (this.isNotEmpty()) HttpResponseStatus.OK.code() else HttpResponseStatus.NO_CONTENT.code(),
+                )
                     .putHeader("content-type", "application/json")
                     .end(
                         Json.encodeToString(this),
diff --git a/src/main/kotlin/infrastructure/api/handlers/ZoneHealthProfessionalTrackingHandler.kt b/src/main/kotlin/infrastructure/api/handlers/ZoneHealthProfessionalTrackingHandler.kt
@@ -13,6 +13,7 @@ import application.presenter.api.tracking.toTrackingInfoDto
 import application.service.TrackingService
 import entity.room.RoomData
 import infrastructure.provider.Provider
+import io.netty.handler.codec.http.HttpResponseStatus
 import io.vertx.core.CompositeFuture
 import io.vertx.core.Handler
 import io.vertx.ext.web.RoutingContext
@@ -45,9 +46,17 @@ class ZoneHealthProfessionalTrackingHandler(
                         val preOperating = result.second.result().map { hp ->
                             hp.result().toTrackingInfoDto()
                         }
+                        val finalList = operating + preOperating
                         routingContext.response()
                             .putHeader("content-type", "application/json")
-                            .end(Json.encodeToString(operating + preOperating))
+                            .setStatusCode(
+                                if (finalList.isNotEmpty()) {
+                                    HttpResponseStatus.OK.code()
+                                } else {
+                                    HttpResponseStatus.NO_CONTENT.code()
+                                },
+                            )
+                            .end(Json.encodeToString(finalList))
                     }
                 }
             }
diff --git a/src/main/kotlin/infrastructure/api/handlers/ZonesHandler.kt b/src/main/kotlin/infrastructure/api/handlers/ZonesHandler.kt
@@ -41,7 +41,10 @@ class ZonesHandler(
                     }?.id?.id,
                 )
             }.run {
-                routingContext.response().setStatusCode(HttpResponseStatus.OK.code())
+                routingContext.response()
+                    .setStatusCode(
+                        if (this.isEmpty()) HttpResponseStatus.OK.code() else HttpResponseStatus.NO_CONTENT.code(),
+                    )
                     .putHeader("content-type", "application/json")
                     .end(
                         Json.encodeToString(this),

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class AdaptEnvironmentHandler(private val vertx: Vertx) : Handler<RoutingContext`
`38`	`38`	`"medical-technology-automation-requests-events",`
`39`	`39`	`Json.encodeToString(event),`
`40`	`40`	`)`
`41`		`- routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()`
	`41`	`+ routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ class BlockHealthProfessionalTrackingHandler(`
`36`	`36`	`}`
`37`	`37`	`routingContext.response()`
`38`	`38`	`.putHeader("content-type", "application/json")`
`39`		`- .setStatusCode(HttpResponseStatus.OK.code())`
	`39`	`+ .setStatusCode(`
	`40`	`+ if (list.isNotEmpty()) HttpResponseStatus.OK.code() else HttpResponseStatus.NO_CONTENT.code(),`
	`41`	`+ )`
`40`	`42`	`.end(Json.encodeToString(block))`
`41`	`43`	`}`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class CustomScenarioHandler(private val vertx: Vertx) : Handler<RoutingContext>`
`40`	`40`	`"automation-requests-events",`
`41`	`41`	`Json.encodeToString(event),`
`42`	`42`	`)`
`43`		`- routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()`
	`43`	`+ routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,12 @@ class RoomInfoHandler(`
`32`	`32`	`provider.webClient,`
`33`	`33`	`).execute().onSuccess { room ->`
`34`	`34`	`routingContext.response()`
`35`		`- .setStatusCode(HttpResponseStatus.OK.code())`
	`35`	`+ .setStatusCode(`
	`36`	`+ if (room != null) HttpResponseStatus.OK.code() else HttpResponseStatus.NOT_FOUND.code(),`
	`37`	`+ )`
`36`	`38`	`.putHeader("content-type", "application/json")`
`37`	`39`	`.end(`
`38`		`- Json.encodeToString(room.toRoomDto()),`
	`40`	`+ Json.encodeToString(room?.toRoomDto()),`
`39`	`41`	`)`
`40`	`42`	`}`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class StopCustomScenarioHandler(private val vertx: Vertx) : Handler<RoutingConte`
`34`	`34`	`"stop-custom-light-events",`
`35`	`35`	`Json.encodeToString(event),`
`36`	`36`	`)`
`37`		`- routingContext.response().setStatusCode(HttpResponseStatus.OK.code()).end()`
	`37`	`+ routingContext.response().setStatusCode(HttpResponseStatus.NO_CONTENT.code()).end()`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,12 @@ class SurgeryReportInfoHandler(`
`31`	`31`	`).execute().onSuccess { report ->`
`32`	`32`	`routingContext`
`33`	`33`	`.response()`
`34`		`- .setStatusCode(HttpResponseStatus.OK.code())`
	`34`	`+ .setStatusCode(`
	`35`	`+ if (report != null) HttpResponseStatus.OK.code() else HttpResponseStatus.NOT_FOUND.code(),`
	`36`	`+ )`
`35`	`37`	`.putHeader("content-type", "application/json")`
`36`	`38`	`.end(`
`37`		`- Json.encodeToJsonElement(report.toApiDto()).toString(),`
	`39`	`+ Json.encodeToJsonElement(report?.toApiDto()).toString(),`
`38`	`40`	`)`
`39`	`41`	`}`
`40`	`42`	`}`