fix(core/jdbc): add missing sort mapping for ServiceInstanceRepositor…

…yInterface
kestra-io · Apr 25, 2024 · fb4da35 · fb4da35
1 parent 671ed5c
commit fb4da35
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/core/src/main/java/io/kestra/core/repositories/ServiceInstanceRepositoryInterface.java b/core/src/main/java/io/kestra/core/repositories/ServiceInstanceRepositoryInterface.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 
 /**
  * Repository service for storing service instance.
@@ -119,5 +120,12 @@ default ServiceStateTransition.Response mayTransitionServiceTo(final ServiceInst
         }
     }
 
-
+    /**
+     * Returns the function to be used for mapping column used to sort result.
+     *
+     * @return  the mapping function.
+     */
+    default Function<String, String> sortMapping(){
+        return Function.identity();
+    }
 }
diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcServiceInstanceRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcServiceInstanceRepository.java
@@ -22,8 +22,10 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static org.jooq.impl.DSL.using;
@@ -297,4 +299,15 @@ private ImmutablePair<ServiceInstance, ServiceInstance> mayUpdateStatusById(fina
     private Table<Record> table() {
         return this.jdbcRepository.getTable();
     }
+
+    /** {@inheritDoc} **/
+    @Override
+    public Function<String, String> sortMapping() {
+        Map<String, String> mapper = Map.of(
+            "createdAt", CREATED_AT.getName(),
+            "updatedAt", UPDATED_AT.getName(),
+            "serviceId", SERVICE_ID.getName()
+        );
+        return mapper::get;
+    }
 }