wip

Author: Zorin95670

.idea/compiler.xml

@@ -33,24 +33,12 @@ entities:
     access:
       create:
         table: ACCOUNT_TABLE_NAME
-        entityMapping:
-          id: "{{ context.response.id }}"
-          userName: "{{ context.response.userName }}"
       update:
         table: ACCOUNT_TABLE_NAME
-        entityMapping:
-          id: "{{ context.response.id }}"
-          userName: "{{ context.response.userName }}"
       delete:
         table: ACCOUNT_TABLE_NAME
-        entityMapping:
-          id: "{{ context.response.id }}"
-          userName: "{{ context.response.userName }}"
       findAll:
         table: ACCOUNT_TABLE_NAME
-        entityMapping:
-          id: "{{ context.response.id }}"
-          userName: "{{ context.response.userName }}"
     attributes:
       - name: id
         type: String
@@ -78,7 +66,6 @@ entities:
 | `providers[].password`                      | ✅       | Database authentication password                                          |
 | `entities[].provider`                       | ✅       | Reference to the database provider name                                   |
 | `entities[].access.table`                   | ✅       | Target database table name for this entity                                |
-| `entities[].access.entityMapping`           | ❌       | Maps fields from the SQL result to the dynamic entity                     |
 | `entities[].attributes[].access.column`     | ✅       | Target database column name for this attribute                            |
 | `entities[].attributes[].access.primaryKey` | ✅       | Indicates if this attribute is a primary key                              |
 

.idea/dataSources.xml

@@ -75,6 +75,12 @@
             <version>2.21.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.hubspot.jinjava</groupId>
+            <artifactId>jinjava</artifactId>
+            <version>2.8.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

dpp/README.md

@@ -108,13 +108,7 @@ public DynamicEntity create(final TaskExecutionContext context,
       final DynamicEntity dynamicEntity) {
     DatabasePluginConfiguration databasePluginConfiguration = getDatabaseConfiguration("create", dynamicEntity);
     DynamicEntity result = crudService.insert(config, databasePluginConfiguration, dynamicEntity);
-
-    System.out.println(result.getAttributes());
-    taskEngine.execute(dynamicEntity, context, "beforeDatabaseMappingCreate");
-    var resultEntity = mappingEntity(context, databasePluginConfiguration, result);
-    taskEngine.execute(dynamicEntity, context, "afterDatabaseMappingCreate");
-
-    return resultEntity;
+    return result;
   }
 
   /**

dpp/pom.xml

@@ -28,6 +28,7 @@
 
 import io.github.linagora.linid.im.corelib.exception.ApiException;
 import io.github.linagora.linid.im.corelib.i18n.I18nMessage;
+import io.github.linagora.linid.im.corelib.plugin.config.dto.AttributeConfiguration;
 import io.github.linagora.linid.im.corelib.plugin.config.dto.ProviderConfiguration;
 import io.github.linagora.linid.im.corelib.plugin.entity.DynamicEntity;
 import io.github.linagora.linid.im.corelib.plugin.task.TaskEngine;
@@ -164,20 +165,16 @@ public DynamicEntity selectOne(final TaskExecutionContext context,
   public DynamicEntity insert(final ProviderConfiguration config,
       final DatabasePluginConfiguration databasePluginConfiguration,
       final DynamicEntity dynamicEntity) {
-
-    DSLContext dsl = dslRegistry.getDsl(config);
     String tableName = databasePluginConfiguration.getTable();
-    Table<?> table = DSL.table(DSL.name(tableName));
-    Map<Field<?>, Object> fields = buildFields(dynamicEntity);
 
-    System.out.println(fields);
     try {
+      DSLContext dsl = dslRegistry.getDsl(config);
+      Table<?> table = DSL.table(DSL.name(tableName));
+      Map<Field<?>, Object> fields = buildFields(tableName, dynamicEntity);
+
       Record record = dsl.insertInto(table)
           .set(fields)
-          // DSL.asterisk allows retrieving all columns of the table (basically does a *
-          // in the query)
-          .returning()
-//          .returning(DSL.asterisk())
+          .returning(fields.keySet())
           .fetchOne();
 
       if (record == null) {
@@ -187,6 +184,7 @@ public DynamicEntity insert(final ProviderConfiguration config,
 
       return mappingEntity(record, dynamicEntity);
     } catch (Exception e) {
+      e.printStackTrace();
       log.error("Error INSERT on tableName `{}`: {}", tableName, e.getMessage());
       throw new ApiException(400,
           I18nMessage.of("dpp.error.insert", Map.of("table", tableName, "error", e.getMessage())));
@@ -203,13 +201,13 @@ public DynamicEntity update(final ProviderConfiguration config,
     String tableName = databasePluginConfiguration.getTable();
     Table<?> table = DSL.table(DSL.name(tableName));
     var idColumn = resolveIdColumn(dynamicEntity);
-    Map<Field<?>, Object> fields = buildFields(dynamicEntity);
+    Map<Field<?>, Object> fields = buildFields(tableName, dynamicEntity);
 
     try {
       Record record = dsl.update(table)
           .set(fields)
           .where(DSL.field(idColumn).eq(id))
-          .returning(DSL.asterisk())
+          .returning(fields.keySet())
           .fetchOne();
 
       if (record == null) {
@@ -242,7 +240,8 @@ public DynamicEntity patch(final ProviderConfiguration config,
       Record record = dsl.update(table)
           .set(fields)
           .where(DSL.field(idColumn).eq(id))
-          .returning(DSL.asterisk())
+          // Rebuild fields to have all fields
+          .returning(buildFields(tableName, dynamicEntity).keySet())
           .fetchOne();
 
       if (record == null) {
@@ -317,15 +316,14 @@ public Name resolveIdColumn(final DynamicEntity dynamicEntity) {
    * @param dynamicEntity the source entity
    * @return the map of database fields and values
    */
-  public Map<Field<?>, Object> buildFields(final DynamicEntity dynamicEntity) {
+  public Map<Field<?>, Object> buildFields(final String tableName, final DynamicEntity dynamicEntity) {
     Map<String, Object> attributes = dynamicEntity.getAttributes();
 
     return dynamicEntity.getConfiguration().getAttributes().stream()
-        .filter(attr -> Boolean.FALSE.equals(attr.getAccess().get("primaryKey")))
         .filter(attr -> attr.getAccess().get("column") != null)
         .collect(Collectors.toMap(
-            attr -> DSL.field(DSL.name((String) attr.getAccess().get("column"))),
-            attr -> attributes.getOrDefault(attr.getName(), null)));
+            attr -> DSL.field(DSL.name(tableName, (String) attr.getAccess().get("column"))),
+            attr -> attributes.getOrDefault(attr.getName(), DSL.defaultValue())));
   }
 
   /**
@@ -359,14 +357,13 @@ public DynamicEntity mappingEntity(final Record record, final DynamicEntity dyna
     entity.setConfiguration(dynamicEntity.getConfiguration());
     entity.setAttributes(new HashMap<>());
 
-    System.out.println(recordMap);
-    dynamicEntity.getConfiguration().getAttributes().forEach(attr -> {
-      String column = (String) attr.getAccess().get("column");
-
-      if (column != null && recordMap.containsKey(column)) {
-        entity.getAttributes().put(attr.getName(), recordMap.get(column));
-      }
-    });
+    entity.setAttributes(dynamicEntity.getConfiguration()
+        .getAttributes()
+        .stream()
+        .collect(Collectors.toMap(
+            AttributeConfiguration::getName,
+            attr -> recordMap.get((String) attr.getAccess().get("column"))
+        )));
 
     return entity;
   }