Cosmetic changes per 20.03.2025

Author: oleg-odysseus

src/main/java/org/ohdsi/webapi/service/lock/ConceptSetLockingService.java

@@ -203,7 +203,17 @@ public List<ConceptSetSnapshotParameters> listSnapshotsByConceptSetId(Integer co
                 "WHERE CONCEPT_SET_ID = ? ORDER BY ACTION_DATE DESC", snapshotHistorySourceProvider.getSnapshotHistorySourceSchema());
 
         CancelableJdbcTemplate jdbcTemplate = getSourceJdbcTemplate(snapshotHistorySourceProvider.getSnapshotHistorySource());
-        return jdbcTemplate.query(sql, new Object[]{conceptSetId}, (rs, rowNum) -> toConceptSetSnapshotParameters(rs));
+        List<ConceptSetSnapshotParameters> snapshots = jdbcTemplate.query(sql, new Object[]{conceptSetId}, (rs, rowNum) -> toConceptSetSnapshotParameters(rs));
+        enrichSnapshotParametersWithEmptyIndicator(snapshots, jdbcTemplate);
+        return snapshots;
+    }
+    private void enrichSnapshotParametersWithEmptyIndicator(List<ConceptSetSnapshotParameters> snapshots, CancelableJdbcTemplate jdbcTemplate){
+        for (ConceptSetSnapshotParameters snapshot : snapshots) {
+            Long snapshotId = snapshot.getSnapshotId();
+            if (isSnapshotEmpty(jdbcTemplate, snapshotId)) {
+                snapshot.setEmptySnapshot(true);
+            }
+        }
     }
 
     private ConceptSetSnapshotParameters toConceptSetSnapshotParameters(ResultSet rs) throws SQLException {
@@ -253,6 +263,26 @@ public List<ConceptSetExpression.ConceptSetItem> getConceptSetSnapshotItemsBySna
         return jdbcTemplate.query(sql, new Object[]{snapshotId}, (rs, rowNum) -> convertToConceptSetItem(rs, type));
     }
 
+    /**
+     * Helper method to check if the snapshot metadata ID has records in associated tables.
+     *
+     * @param jdbcTemplate JDBC template for querying the database.
+     * @param snapshotMetadataId Metadata ID to check for records.
+     * @return true if all tables are empty, false if at least one table contains records.
+     */
+    private boolean isSnapshotEmpty(CancelableJdbcTemplate jdbcTemplate, Long snapshotMetadataId) {
+        String itemSnapshotsQuery = String.format("SELECT COUNT(*) FROM %s.CONCEPT_SET_ITEM_SNAPSHOTS WHERE SNAPSHOT_METADATA_ID = ?", snapshotHistorySourceProvider.getSnapshotHistorySourceSchema());
+        Integer itemSnapshotsCount = jdbcTemplate.queryForObject(itemSnapshotsQuery, new Object[]{snapshotMetadataId}, Integer.class);
+
+        String includedConceptsQuery = String.format("SELECT COUNT(*) FROM %s.INCLUDED_CONCEPTS_SNAPSHOTS WHERE SNAPSHOT_METADATA_ID = ?", snapshotHistorySourceProvider.getSnapshotHistorySourceSchema());
+        Integer includedConceptsCount = jdbcTemplate.queryForObject(includedConceptsQuery, new Object[]{snapshotMetadataId}, Integer.class);
+
+        String includedSourceCodesQuery = String.format("SELECT COUNT(*) FROM %s.INCLUDED_SOURCE_CODES_SNAPSHOTS WHERE SNAPSHOT_METADATA_ID = ?", snapshotHistorySourceProvider.getSnapshotHistorySourceSchema());
+        Integer includedSourceCodesCount = jdbcTemplate.queryForObject(includedSourceCodesQuery, new Object[]{snapshotMetadataId}, Integer.class);
+
+        return (itemSnapshotsCount == 0) && (includedConceptsCount == 0) && (includedSourceCodesCount == 0);
+    }
+
     private ConceptSetExpression.ConceptSetItem convertToConceptSetItem(ResultSet rs, GetConceptSetSnapshotItemsRequest.ItemType type) throws SQLException {
         Concept concept = new Concept();
         concept.conceptId = rs.getLong("CONCEPT_ID");

src/main/java/org/ohdsi/webapi/service/lock/dto/ConceptSetSnapshotParameters.java

@@ -10,6 +10,7 @@ public class ConceptSetSnapshotParameters {
 	private String vocabularyBundleVersion;
 	private String conceptSetVersion;
 	private String message;
+	private boolean emptySnapshot;
 
 	public String getSnapshotDate() {
 		return snapshotDate;
@@ -82,4 +83,12 @@ public Long getSnapshotId() {
 	public void setSnapshotId(Long snapshotId) {
 		this.snapshotId = snapshotId;
 	}
+
+	public boolean isEmptySnapshot() {
+		return emptySnapshot;
+	}
+
+	public void setEmptySnapshot(boolean emptySnapshot) {
+		this.emptySnapshot = emptySnapshot;
+	}
 }