avniproject/avni-product#1334 | summaryTable endpoint added in Activi…

…ties tab Signed-off-by: ak2502 <akanksha.feb25@gmail.com>
AvinashRamachandruni · Aug 23, 2023 · f0f40aa · f0f40aa
1 parent 75be325
commit f0f40aa
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 0 deletions.
diff --git a/src/main/java/org/avniproject/etl/controller/ReportController.java b/src/main/java/org/avniproject/etl/controller/ReportController.java
@@ -23,6 +23,16 @@ public ReportController(ReportRepository reportRepository, ReportUtil reportUtil
         this.reportUtil = reportUtil;
     }
 
+    @PreAuthorize("hasAnyAuthority('analytics_user')")
+    @RequestMapping(value = "/report/aggregate/summaryTable", method = RequestMethod.GET)
+    public List<UserActivityDTO> getSummaryTable(@RequestParam(value = "startDate", required = false) String startDate,
+                                                 @RequestParam(value = "endDate", required = false) String endDate,
+                                                 @RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds){
+        return reportRepository.generateSummaryTable(
+                OrgIdentityContextHolder.getDbSchema()
+        );
+    }
+
     @PreAuthorize("hasAnyAuthority('analytics_user')")
     @RequestMapping(value = "report/hr/userActivity", method = RequestMethod.GET)
     public List<UserActivityDTO> getUserActivity(@RequestParam(value = "startDate", required = false) String startDate,

diff --git a/src/main/java/org/avniproject/etl/dto/UserActivityDTO.java b/src/main/java/org/avniproject/etl/dto/UserActivityDTO.java
@@ -4,6 +4,8 @@
 
 public class UserActivityDTO {
 
+    private String tableName;
+    private String tableType;
     private String userName;
     private Long id;
     private Long registrationCount;
@@ -20,6 +22,22 @@ public class UserActivityDTO {
     private DateTime syncEnd;
     private DateTime lastSuccessfulSync;
 
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getTableType() {
+        return tableType;
+    }
+
+    public void setTableType(String tableType) {
+        this.tableType = tableType;
+    }
+
     public String getUserName() {
         return userName;
     }

diff --git a/src/main/java/org/avniproject/etl/repository/ReportRepository.java b/src/main/java/org/avniproject/etl/repository/ReportRepository.java
@@ -22,6 +22,15 @@ public ReportRepository(NamedParameterJdbcTemplate jdbcTemplate, SchemaMetadataR
         this.schemaMetadataRepository = schemaMetadataRepository;
     }
 
+    public List<UserActivityDTO> generateSummaryTable(String orgSchemaName){
+        String baseQuery = "select name, type \n" +
+                "from public.table_metadata\n" +
+                "where schema_name = '${schemaName}'\n" +
+                "order by type;";
+        String query= baseQuery.replace("${schemaName}", orgSchemaName);
+        return jdbcTemplate.query(query, new SummaryTableMapper());
+    }
+
     public List<UserActivityDTO> generateUserActivity(String orgSchemaName, String subjectWhere, String encounterWhere, String enrolmentWhere, String userWhere) {
         SchemaMetadata schema = schemaMetadataRepository.getExistingSchemaMetadata();
         List<String> subjectTableNames = schema.getAllSubjectTableNames().stream().toList();

diff --git a/src/main/java/org/avniproject/etl/repository/rowMappers/reports/SummaryTableMapper.java b/src/main/java/org/avniproject/etl/repository/rowMappers/reports/SummaryTableMapper.java
@@ -0,0 +1,17 @@
+package org.avniproject.etl.repository.rowMappers.reports;
+
+import org.avniproject.etl.dto.UserActivityDTO;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class SummaryTableMapper implements RowMapper<UserActivityDTO> {
+    @Override
+    public UserActivityDTO mapRow(ResultSet rs, int rowNum) throws SQLException {
+        UserActivityDTO userActivityDTO = new UserActivityDTO();
+        userActivityDTO.setTableName(rs.getString("name"));
+        userActivityDTO.setTableType(rs.getString("type"));
+        return userActivityDTO;
+    }
+}