wip

Author: Zorin95670

dpp/src/main/java/io/github/linagora/linid/im/dpp/DatabaseProviderPlugin.java

@@ -59,8 +59,6 @@ public class DatabaseProviderPlugin implements ProviderPlugin {
   private final CrudService crudService;
   private final TaskEngine taskEngine;
 
-  private static final String RESPONSE = "response";
-
   /**
    * Service used to render Jinja templates within URIs, request bodies, headers,
    * and response mappings.
@@ -95,12 +93,12 @@ public DynamicEntity create(
       ProviderConfiguration config,
       DynamicEntity dynamicEntity) {
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("create", dynamicEntity);
-    crudService.insert(config, databasePluginConfiguration, dynamicEntity);
-    context.put(RESPONSE, dynamicEntity);
+    DynamicEntity result = crudService.insert(config, databasePluginConfiguration, dynamicEntity);
 
-    taskEngine.execute(dynamicEntity, context, "beforeMappingCreate");
-    var resultEntity = mappingEntity(context, databasePluginConfiguration, dynamicEntity);
-    taskEngine.execute(dynamicEntity, context, "afterMappingCreate");
+    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingCreate");
+    var resultEntity = mappingEntity(context, databasePluginConfiguration, result);
+    // todo: mappingEntity => DONE
+    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingCreate");
 
     return resultEntity;
   }
@@ -140,16 +138,21 @@ public DynamicEntity patch(
       DynamicEntity dynamicEntity) {
 
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("patch", dynamicEntity);
-    DynamicEntity existingEntity = crudService.selectOne(context, config, databasePluginConfiguration, id, dynamicEntity);
+    DynamicEntity entity = crudService.selectOne(context, config, databasePluginConfiguration, id, dynamicEntity);
 
-    if (existingEntity != null) {
+    if (entity != null) {
       ModelMapper modelMapper = new ModelMapper();
-      modelMapper.map(dynamicEntity, existingEntity);
-      crudService.update(config, databasePluginConfiguration, id, existingEntity);
-      return existingEntity;
+      modelMapper.map(dynamicEntity, entity);
+      crudService.update(config, databasePluginConfiguration, id, entity);
     }
 
-    return dynamicEntity;
+    DynamicEntity result = crudService.selectOne(context, config, databasePluginConfiguration, id, dynamicEntity);
+
+    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingPatch");
+    var resultEntity = mappingEntity(context, databasePluginConfiguration, result);
+    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingPatch");
+
+    return resultEntity;
   }
 
   @Override
@@ -162,11 +165,10 @@ public DynamicEntity findById(
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("findById", dynamicEntity);
 
     DynamicEntity result = crudService.selectOne(context, config, databasePluginConfiguration, id, dynamicEntity);
-    context.put(RESPONSE, result);
 
-    taskEngine.execute(dynamicEntity, context, "beforeMappingFindById");
-    var resultEntity = mappingEntity(context, databasePluginConfiguration, dynamicEntity);
-    taskEngine.execute(dynamicEntity, context, "afterMappingFindById");
+    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingFindById");
+    var resultEntity = mappingEntity(context, databasePluginConfiguration, result);
+    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingFindById");
 
     return resultEntity;
   }
@@ -180,28 +182,35 @@ public Page<DynamicEntity> findAll(
       DynamicEntity dynamicEntity) {
 
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("findAll", dynamicEntity);
-    Page<DynamicEntity> result = crudService.select(context, config, databasePluginConfiguration, dynamicEntity, filters, pageable);
-    context.put(RESPONSE, result);
+    Page<DynamicEntity> result = crudService.select(context, config, databasePluginConfiguration, dynamicEntity,
+        filters, pageable);
 
-    taskEngine.execute(dynamicEntity, context, "beforeMappingFindAll");
-    Page<DynamicEntity> entities = mappingEntities(context, databasePluginConfiguration, dynamicEntity, result);
-    taskEngine.execute(dynamicEntity, context, "afterMappingFindAll");
+    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingFindAll");
+    Page<DynamicEntity> resultEntity = mappingEntities(context, databasePluginConfiguration, dynamicEntity, result);
+    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingFindAll");
 
-    return entities;
+    return resultEntity;
   }
 
   @Override
   public DynamicEntity update(
       TaskExecutionContext context,
       ProviderConfiguration config,
-      String id,
+      Object id,
       DynamicEntity dynamicEntity) {
 
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("update", dynamicEntity);
 
-    crudService.update(config, databasePluginConfiguration, id, dynamicEntity);
+    DynamicEntity result = crudService.update(config, databasePluginConfiguration, id, dynamicEntity);
+
+    // TODO: mappingEntity => DONE
+    // TODO: missing bferoce Update => DONE
+    // TODO: missing after Update => DONE
+    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingUpdate");
+    DynamicEntity resultEntity = mappingEntity(context, databasePluginConfiguration, result);
+    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingUpdate");
 
-    return dynamicEntity;
+    return resultEntity;
   }
 
   public DynamicEntity mappingEntity(TaskExecutionContext taskContext, DatabasePluginConfiguration configuration,
@@ -230,12 +239,14 @@ public DynamicEntity mappingEntity(TaskExecutionContext taskContext, DatabasePlu
    * @param pageable      the pagination information for the result set.
    * @return a pageable list of mapped entities.
    */
-  public Page<DynamicEntity> mappingEntities(TaskExecutionContext taskContext, DatabasePluginConfiguration configuration,
+  public Page<DynamicEntity> mappingEntities(TaskExecutionContext taskContext,
+      DatabasePluginConfiguration configuration,
       DynamicEntity dynamicEntity, Page<DynamicEntity> selectResult) {
     List<DynamicEntity> content = new ArrayList<>();
 
     Pageable pageable = selectResult.getPageable();
     int itemsSize = pageable.getPageSize();
+
     for (int i = 0; i < itemsSize; i++) {
       final int index = i;
       var result = new DynamicEntity();
@@ -271,7 +282,7 @@ public DatabasePluginConfiguration getDatabaseConfiguration(String action, Dynam
 
     return mapper.convertValue(
         access.get(action),
-        new TypeReference<DatabasePluginConfiguration>() {
+        new TypeReference<>() {
         });
   }
 }

dpp/src/main/java/io/github/linagora/linid/im/dpp/service/CrudService.java

@@ -68,17 +68,17 @@ public interface CrudService {
    * @param dynamicEntity the dynamic entity containing the table name in its configuration
    * @return the matching entity, or null if not found
    */
-  DynamicEntity selectOne(TaskExecutionContext context, ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, String id, DynamicEntity dynamicEntity);
+  DynamicEntity selectOne(TaskExecutionContext context, ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, Object id, DynamicEntity dynamicEntity);
 
   /**
    * Inserts a new row into the given table.
    *
    * @param config the provider configuration (datasource credentials, pool settings)
    * @param databaseConfiguration the database configuration containing the table name
    * @param dynamicEntity the dynamic entity containing the table name and values in its configuration
-   * @return the number of rows affected
+   * @return the inserted entity
    */
-  int insert(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, DynamicEntity dynamicEntity);
+  DynamicEntity insert(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, DynamicEntity dynamicEntity);
 
   /**
    * Updates rows in the given table where the id column matches the given value.
@@ -87,9 +87,9 @@ public interface CrudService {
    * @param databaseConfiguration the database configuration containing the table name
    * @param id the value the identifier column must match
    * @param dynamicEntity the dynamic entity containing the table name and values in its configuration
-   * @return the number of rows affected
+   * @return the updated entity
    */
-  int update(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, String id, DynamicEntity dynamicEntity);
+  DynamicEntity update(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, Object id, DynamicEntity dynamicEntity);
 
   /**
    * Deletes rows from the given table where the id column matches the given value.
@@ -98,7 +98,6 @@ public interface CrudService {
    * @param databaseConfiguration the database configuration containing the table name
    * @param id the value the identifier column must match
    * @param dynamicEntity the dynamic entity containing the table name in its configuration
-   * @return the number of rows affected
    */
-  int delete(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, String id, DynamicEntity dynamicEntity);
+  void delete(ProviderConfiguration config, DatabasePluginConfiguration databaseConfiguration, Object id, DynamicEntity dynamicEntity);
 }