From 2982f214318852a5ddf2a8fd330ed0e070192e6e Mon Sep 17 00:00:00 2001
From: Thiago Hora <thiagoh@comet.com>
Date: Fri, 4 Oct 2024 12:04:28 +0200
Subject: [PATCH] [OPIK-159] Address missing comments

---
 .../main/java/com/comet/opik/domain/ExperimentDAO.java |  6 +++---
 .../java/com/comet/opik/domain/ExperimentItemDAO.java  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentDAO.java
index d31d860f..2e24de9f 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentDAO.java
@@ -543,6 +543,7 @@ public Mono<Long> delete(Set<UUID> ids) {
 
         return Mono.from(connectionFactory.create())
                 .flatMapMany(connection -> delete(ids, connection))
+                .flatMap(Result::getRowsUpdated)
                 .reduce(Long::sum)
                 .doFinally(signalType -> {
                     if (signalType == SignalType.ON_COMPLETE) {
@@ -551,12 +552,11 @@ public Mono<Long> delete(Set<UUID> ids) {
                 });
     }
 
-    private Publisher<Long> delete(Set<UUID> ids, Connection connection) {
+    private Flux<? extends Result> delete(Set<UUID> ids, Connection connection) {
 
         var statement = connection.createStatement(DELETE_BY_IDS)
                 .bind("ids", ids.toArray(UUID[]::new));
 
-        return makeFluxContextAware(bindWorkspaceIdToFlux(statement))
-                .flatMap(Result::getRowsUpdated);
+        return makeFluxContextAware(bindWorkspaceIdToFlux(statement));
     }
 }
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentItemDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentItemDAO.java
index 78c9ad43..2bf9d394 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentItemDAO.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/ExperimentItemDAO.java
@@ -119,7 +119,7 @@ INSERT INTO experiment_items (
             ;
             """;
 
-    private static final String DELETE_BY_EXPERIMENT_ID = """
+    private static final String DELETE_BY_EXPERIMENT_IDS = """
             DELETE FROM experiment_items
             WHERE experiment_id IN :experiment_ids
             AND workspace_id = :workspace_id
@@ -279,6 +279,7 @@ public Mono<Long> deleteByExperimentIds(Set<UUID> experimentIds) {
 
         return Mono.from(connectionFactory.create())
                 .flatMapMany(connection -> deleteByExperimentIds(experimentIds, connection))
+                .flatMap(Result::getRowsUpdated)
                 .reduce(0L, Long::sum)
                 .doFinally(signalType -> {
                     if (signalType == SignalType.ON_COMPLETE) {
@@ -288,11 +289,10 @@ public Mono<Long> deleteByExperimentIds(Set<UUID> experimentIds) {
                 });
     }
 
-    private Publisher<Long> deleteByExperimentIds(Set<UUID> ids, Connection connection) {
-        Statement statement = connection.createStatement(DELETE_BY_EXPERIMENT_ID)
+    private Flux<? extends Result> deleteByExperimentIds(Set<UUID> ids, Connection connection) {
+        Statement statement = connection.createStatement(DELETE_BY_EXPERIMENT_IDS)
                 .bind("experiment_ids", ids.toArray(UUID[]::new));
 
-        return makeFluxContextAware(bindWorkspaceIdToFlux(statement))
-                .flatMap(Result::getRowsUpdated);
+        return makeFluxContextAware(bindWorkspaceIdToFlux(statement));
     }
 }