avniproject#762 | Working code with MetabaseQueryBuilder and Question…

…CreationService

avni-server-api/src/main/java/org/avni/server/dao/metabase/CollectionRepository.java

@@ -1,6 +1,6 @@
 package org.avni.server.dao.metabase;
 
-import org.avni.server.domain.metabase.Collection;
+import org.avni.server.domain.metabase.CreateCollectionRequest;
 import org.avni.server.domain.metabase.CollectionResponse;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Repository;
@@ -11,8 +11,8 @@ public CollectionRepository(RestTemplateBuilder restTemplateBuilder) {
         super(restTemplateBuilder);
     }
 
-    public CollectionResponse save(Collection collection) {
+    public CollectionResponse save(CreateCollectionRequest createCollectionRequest) {
         String url = metabaseApiUrl + "/collection";
-        return postForObject(url, collection, CollectionResponse.class);
+        return postForObject(url, createCollectionRequest, CollectionResponse.class);
     }
 }

avni-server-api/src/main/java/org/avni/server/dao/metabase/DatabaseRepository.java

@@ -8,7 +8,6 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Repository;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import java.util.List;
 
 @Repository
@@ -26,42 +25,66 @@ public Database save(Database database) {
         return database;
     }
 
-    public Database getDatabaseByName(String databaseName) {
+    public Database getDatabaseById(Database database) {
+        int id = database.getId();
+        String url = metabaseApiUrl + "/database/" + id;
+        try {
+            String jsonResponse = getForObject(url, String.class);
+            ObjectMapper objectMapper = new ObjectMapper();
+            return objectMapper.readValue(jsonResponse, Database.class);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to retrieve database with ID " + id, e);
+        }
+    }
+
+    public Database getDatabaseByName(String name) {
         String url = metabaseApiUrl + "/database";
+
         String jsonResponse = getForObject(url, String.class);
+
         try {
-            List<Database> databases = objectMapper.readValue(jsonResponse, new TypeReference<List<Database>>() {});
-            return databases.stream()
-                    .filter(db -> db.getName().equals(databaseName))
-                    .findFirst()
-                    .orElseThrow(() -> new RuntimeException("Database with name " + databaseName + " not found."));
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode rootNode = objectMapper.readTree(jsonResponse);
+            JsonNode dataArray = rootNode.path("data");
+
+            for (JsonNode dbNode : dataArray) {
+                Database db = objectMapper.treeToValue(dbNode, Database.class);
+                if (db.getName().equals(name)) {
+                    return db;
+                }
+            }
+            throw new RuntimeException("Database with name " + name + " not found.");
         } catch (Exception e) {
             throw new RuntimeException("Failed to retrieve database", e);
         }
     }
 
-    public MetabaseCollectionInfo getCollectionByName(String collectionName) {
+    public CollectionInfoResponse getCollectionByName(String collectionName) {
         String url = metabaseApiUrl + "/collection";
-        String jsonResponse = getForObject(url, String.class);
-
         try {
-            List<MetabaseCollectionInfo> collections = objectMapper.readValue(jsonResponse, new TypeReference<List<MetabaseCollectionInfo>>() {});
+            String jsonResponse = getForObject(url, String.class);
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<CollectionInfoResponse> collections = objectMapper.readValue(
+                    jsonResponse, new TypeReference<List<CollectionInfoResponse>>() {}
+            );
+
             return collections.stream()
-                    .filter(coll -> coll.getName().equals(collectionName))
+                    .filter(collection -> collection.getName().equals(collectionName))
                     .findFirst()
                     .orElseThrow(() -> new RuntimeException("Collection with name " + collectionName + " not found."));
         } catch (Exception e) {
             throw new RuntimeException("Failed to retrieve collection", e);
         }
     }
 
-    public void createQuestionForTable(Database database, TableDetails tableDetails, String addressTableName, String addressField, String tableField) throws Exception {
-        TableDetails addressTableDetails = getTableDetailsByDisplayName(database, addressTableName);
+    public void createQuestionForTable(Database database, TableDetails tableDetails, String addressTableName, String addressField, String tableField) {
+        TableDetails addressTableDetails = getTableDetailsByName(database, addressTableName);
         FieldDetails joinField1 = getFieldDetailsByName(database, addressTableName, addressField);
         FieldDetails joinField2 = getFieldDetailsByName(database, tableDetails.getName(), tableField);
 
         ArrayNode joinsArray = objectMapper.createArrayNode();
-        MetabaseQuery query = new MetabaseQueryBuilder(database, joinsArray)
+        MetabaseQuery query = new MetabaseQueryBuilder(database, joinsArray, objectMapper)
                 .forTable(tableDetails)
                 .joinWith(addressTableDetails, joinField1, joinField2)
                 .build();
@@ -72,7 +95,7 @@ public void createQuestionForTable(Database database, TableDetails tableDetails,
                 VisualizationType.TABLE,
                 null,
                 objectMapper.createObjectNode(),
-                getCollectionByName(database.getName()).getId(),
+                getCollectionByName(database.getName()).getIdAsInt(),
                 CardType.QUESTION
         );
 
@@ -111,16 +134,16 @@ public List<FieldDetails> getFields(Database database) {
         }
     }
 
-    public TableDetails getTableDetailsByDisplayName(Database database, String tableName) {
+    public TableDetails getTableDetailsByName(Database database, String tableName) {
         MetabaseDatabaseInfo databaseInfo = getDatabaseDetails(database);
         return databaseInfo.getTables().stream()
-                .filter(tableDetail -> tableDetail.nameMatches(tableName))
+                .filter(tableDetail -> tableDetail.getName().equalsIgnoreCase(tableName))
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("Table with name " + tableName + " not found."));
     }
 
-    public DatabaseSyncStatus getInitialSyncStatus(int databaseId) {
-        String url = metabaseApiUrl + "/database/" + databaseId;
+    public DatabaseSyncStatus getInitialSyncStatus(Database database) {
+        String url = metabaseApiUrl + "/database/" + database.getId();
         String jsonResponse = getForObject(url, String.class);
         try {
             return objectMapper.readValue(jsonResponse, DatabaseSyncStatus.class);

avni-server-api/src/main/java/org/avni/server/domain/metabase/CollectionInfoResponse.java

@@ -0,0 +1,56 @@
+package org.avni.server.domain.metabase;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CollectionInfoResponse {
+
+    private String name;
+    private String id;
+    private boolean isPersonal;
+
+    public CollectionInfoResponse() {
+    }
+
+    public CollectionInfoResponse(@JsonProperty("name") String name,
+                                  @JsonProperty("id") Object id,
+                                  @JsonProperty("is_personal") boolean isPersonal) {
+        this.name = name;
+        this.isPersonal = isPersonal;
+
+        if (id instanceof Integer) {
+            this.id = String.valueOf(id);
+        } else {
+            this.id = id.toString();
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getIdAsInt() {
+        try {
+            return Integer.parseInt(id);
+        } catch (NumberFormatException e) {
+            throw new RuntimeException("Failed to convert id to integer: " + id, e);
+        }
+    }
+
+    public boolean isPersonal() {
+        return isPersonal;
+    }
+
+    public void setPersonal(boolean personal) {
+        isPersonal = personal;
+    }
+}

avni-server-api/src/main/java/org/avni/server/domain/metabase/Collection.java → avni-server-api/src/main/java/org/avni/server/domain/metabase/CreateCollectionRequest.java

@@ -1,10 +1,10 @@
 package org.avni.server.domain.metabase;
 
-public class Collection {
+public class CreateCollectionRequest {
     private String name;
     private String description;
 
-    public Collection(String name, String description) {
+    public CreateCollectionRequest(String name, String description) {
         this.name = name;
         this.description = description;
     }

avni-server-api/src/main/java/org/avni/server/domain/metabase/Database.java

@@ -1,5 +1,8 @@
 package org.avni.server.domain.metabase;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Database {
     private Integer id;
     private String name;

avni-server-api/src/main/java/org/avni/server/domain/metabase/DatabaseDetails.java

@@ -1,5 +1,8 @@
 package org.avni.server.domain.metabase;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DatabaseDetails {
     private String host;
     private String port;

avni-server-api/src/main/java/org/avni/server/domain/metabase/MetabaseQuery.java

@@ -1,28 +1,20 @@
 package org.avni.server.domain.metabase;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class MetabaseQuery {
-    private final Database database;
-    private final ArrayNode joins;
+    private final int databaseId;
+    private final ObjectNode queryNode;
 
-    public MetabaseQuery(Database database, ArrayNode joins) {
-        this.database = database;
-        this.joins = joins;
+    public MetabaseQuery(int databaseId, ObjectNode queryNode) {
+        this.databaseId = databaseId;
+        this.queryNode = queryNode;
     }
 
     public int getDatabaseId() {
-        return database.getId();
+        return databaseId;
     }
 
-
-    public ObjectNode toJson(ObjectMapper objectMapper) {
-        ObjectNode queryNode = objectMapper.createObjectNode();
-        queryNode.put("database", database.getId());
-        queryNode.set("joins", joins);
-        queryNode.put("type", "query");
+    public ObjectNode toJson() {
         return queryNode;
     }
 }

avni-server-api/src/main/java/org/avni/server/domain/metabase/MetabaseQueryBuilder.java

@@ -1,41 +1,57 @@
-// to be completed
 package org.avni.server.domain.metabase;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class MetabaseQueryBuilder {
     private final Database database;
-    private ArrayNode joins;
+    private final ArrayNode joinsArray;
+    private final ObjectMapper objectMapper;
+    private ObjectNode queryNode;
 
-    public MetabaseQueryBuilder(Database database, ArrayNode joins) {
+    public MetabaseQueryBuilder(Database database, ArrayNode joinsArray, ObjectMapper objectMapper) {
         this.database = database;
-        this.joins = joins;
+        this.joinsArray = joinsArray;
+        this.objectMapper = objectMapper;
+        this.queryNode = objectMapper.createObjectNode();
     }
 
     public MetabaseQueryBuilder forTable(TableDetails tableDetails) {
-        // code to be added
+        queryNode.put("source-table", tableDetails.getId());
+        queryNode.put("database", database.getId());
         return this;
     }
 
-
-    public MetabaseQueryBuilder joinWith(TableDetails joinTable, FieldDetails originField, FieldDetails destinationField) {
-        // Build the join condition and add to the joins array
-        ObjectMapper objectMapper = new ObjectMapper();
-        ArrayNode joinCondition = objectMapper.createArrayNode();
-
-        joinCondition.add(ConditionType.EQUAL.getOperator());
-        joinCondition.add(objectMapper.createArrayNode().add("field").add(originField.getId()));
-        joinCondition.add(objectMapper.createArrayNode().add("field").add(destinationField.getId()));
-
-        joins.add(joinCondition);
+    public MetabaseQueryBuilder  joinWith(TableDetails addressTable, FieldDetails joinField1, FieldDetails joinField2) {
+        ObjectNode joinNode = objectMapper.createObjectNode();
+        joinNode.put("fields", "all");
+        joinNode.put("alias", addressTable.getName());
+        joinNode.put("source-table", addressTable.getId());
+
+        ArrayNode conditionArray = objectMapper.createArrayNode();
+        conditionArray.add("=");
+
+        ArrayNode leftField = objectMapper.createArrayNode();
+        leftField.add("field");
+        leftField.add(joinField1.getId());
+        leftField.add(objectMapper.createObjectNode().put("base-type", "type/Integer"));
+        conditionArray.add(leftField);
+
+        ArrayNode rightField = objectMapper.createArrayNode();
+        rightField.add("field");
+        rightField.add(joinField2.getId());
+        rightField.add(objectMapper.createObjectNode().put("base-type", "type/Integer").put("join-alias", addressTable.getName()));
+        conditionArray.add(rightField);
+
+        joinNode.set("condition", conditionArray);
+        joinsArray.add(joinNode);
+        queryNode.set("joins", joinsArray);
         return this;
     }
 
-
     public MetabaseQuery build() {
-        return new MetabaseQuery(database, joins);
+        queryNode.put("type", "query");
+        return new MetabaseQuery(database.getId(), queryNode);
     }
 }

avni-server-api/src/main/java/org/avni/server/domain/metabase/MetabaseRequestBody.java

@@ -32,7 +32,7 @@ public ObjectNode toJson(ObjectMapper objectMapper) {
         ObjectNode datasetQueryNode = objectMapper.createObjectNode();
         datasetQueryNode.put("database", datasetQuery.getDatabaseId());
         datasetQueryNode.put("type", "query");
-        datasetQueryNode.set("query", datasetQuery.toJson(objectMapper));
+        datasetQueryNode.set("query", datasetQuery.toJson());
 
         rootNode.set("dataset_query", datasetQueryNode);
         rootNode.put("display", display.toString());