avniproject/avni-media#134 | Include entityId in media search response

avniproject · Nov 8, 2023 · 233c37f · 233c37f
1 parent 636187d
commit 233c37f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/avniproject/etl/dto/MediaDTO.java b/src/main/java/org/avniproject/etl/dto/MediaDTO.java
@@ -3,5 +3,5 @@
 
 import java.net.URL;
 
-public record MediaDTO(String uuid, String subjectFirstName, String subjectLastName, String url, String conceptName, URL signedUrl, String thumbnailUrl, URL signedThumbnailUrl, String subjectTypeName, String programEnrolment, String encounterTypeName, String lastModifiedDateTime, String createdDateTime, String syncConcept1Name, String syncConcept2Name, String syncParameterValue1, String syncParameterValue2, Object address){
+public record MediaDTO(String uuid, String subjectFirstName, String subjectLastName, String url, String conceptName, URL signedUrl, String thumbnailUrl, URL signedThumbnailUrl, String subjectTypeName, String programEnrolment, String encounterTypeName, String lastModifiedDateTime, String createdDateTime, String syncConcept1Name, String syncConcept2Name, String syncParameterValue1, String syncParameterValue2, Object address, long entityId){
 }
diff --git a/src/main/java/org/avniproject/etl/repository/service/MediaTableRepositoryService.java b/src/main/java/org/avniproject/etl/repository/service/MediaTableRepositoryService.java
@@ -50,7 +50,8 @@ public MediaDTO setMediaDto(ResultSet rs) {
                     rs.getString("sync_parameter_key2"),
                     rs.getString("sync_parameter_value1"),
                     rs.getString("sync_parameter_value2"),
-                    rs.getString("address")
+                    rs.getString("address"),
+                    rs.getLong("entity_id")
             );
         } catch (SQLException e) {
             throw new Error("Error:" + e.getMessage());

diff --git a/src/main/resources/sql/api/searchMedia.sql.st b/src/main/resources/sql/api/searchMedia.sql.st
@@ -17,7 +17,8 @@ SELECT media.id as id,
        media.encounter_type_name as encounter_type_name,
        media.program_name as program_name,
        media.concept_name as concept_name,
-       row_to_json(address.*) as address
+       row_to_json(address.*) as address,
+       media.entity_id as entity_id
 FROM <schemaName>.media media
          JOIN <schemaName>.address address ON address.id = media.address_id
          <if(joinTablesAndColumns)>