Skip to content

Commit 82e46c3

Browse files
committed
Return an empty column DQ status model when the status for the table is missing.
1 parent de2a2f5 commit 82e46c3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

dqops/src/main/java/com/dqops/rest/controllers/ColumnsController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public ResponseEntity<Flux<ColumnListModel>> getColumns(
182182
TableCurrentDataQualityStatusModel currentTableStatus = this.tableStatusCache.getCurrentTableStatus(tableStatusKey, checkType.orElse(null));
183183
if (currentTableStatus != null) {
184184
ColumnCurrentDataQualityStatusModel columnQualityStatusModel = currentTableStatus.getColumns().get(listModel.getColumnName());
185-
listModel.setDataQualityStatus(columnQualityStatusModel != null ? columnQualityStatusModel.shallowCloneWithoutChecks() : null);
185+
listModel.setDataQualityStatus(columnQualityStatusModel != null ? columnQualityStatusModel.shallowCloneWithoutChecks() : new ColumnCurrentDataQualityStatusModel());
186186
}
187187
});
188188

@@ -199,7 +199,8 @@ public ResponseEntity<Flux<ColumnListModel>> getColumns(
199199
TableCurrentDataQualityStatusModel currentTableStatus = this.tableStatusCache.getCurrentTableStatus(tableStatusKey, checkType.orElse(null));
200200
if (currentTableStatus != null) {
201201
ColumnCurrentDataQualityStatusModel columnQualityStatusModel = currentTableStatus.getColumns().get(columnListModel.getColumnName());
202-
columnListModel.setDataQualityStatus(columnQualityStatusModel != null ? columnQualityStatusModel.shallowCloneWithoutChecks() : null);
202+
columnListModel.setDataQualityStatus(columnQualityStatusModel != null ?
203+
columnQualityStatusModel.shallowCloneWithoutChecks() : null);
203204
}
204205
}
205206
return columnListModel;

dqops/src/main/java/com/dqops/rest/controllers/SearchController.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public ResponseEntity<Flux<TableListModel>> findTables(
199199
CurrentTableStatusKey tableStatusKey = new CurrentTableStatusKey(principal.getDataDomainIdentity().getDataDomainCloud(),
200200
tableListModel.getConnectionName(), tableListModel.getTarget());
201201
TableCurrentDataQualityStatusModel currentTableStatus = this.tableStatusCache.getCurrentTableStatus(tableStatusKey, checkType.orElse(null));
202-
tableListModel.setDataQualityStatus(currentTableStatus != null ? currentTableStatus.shallowCloneWithoutCheckResultsAndColumns() : null);
202+
tableListModel.setDataQualityStatus(currentTableStatus != null ? currentTableStatus.shallowCloneWithoutCheckResultsAndColumns() : new TableCurrentDataQualityStatusModel());
203203
}
204204
return tableListModel;
205205
}));
@@ -319,7 +319,8 @@ public ResponseEntity<Flux<ColumnListModel>> findColumns(
319319
TableCurrentDataQualityStatusModel currentTableStatus = this.tableStatusCache.getCurrentTableStatus(tableStatusKey, checkType.orElse(null));
320320
if (currentTableStatus != null) {
321321
ColumnCurrentDataQualityStatusModel columnQualityStatusModel = currentTableStatus.getColumns().get(listModel.getColumnName());
322-
listModel.setDataQualityStatus(columnQualityStatusModel != null ? columnQualityStatusModel.shallowCloneWithoutChecks() : null);
322+
listModel.setDataQualityStatus(columnQualityStatusModel != null ?
323+
columnQualityStatusModel.shallowCloneWithoutChecks() : new ColumnCurrentDataQualityStatusModel());
323324
}
324325
});
325326

@@ -336,7 +337,8 @@ public ResponseEntity<Flux<ColumnListModel>> findColumns(
336337
TableCurrentDataQualityStatusModel currentTableStatus = this.tableStatusCache.getCurrentTableStatus(tableStatusKey, checkType.orElse(null));
337338
if (currentTableStatus != null) {
338339
ColumnCurrentDataQualityStatusModel columnQualityStatusModel = currentTableStatus.getColumns().get(listModel.getColumnName());
339-
listModel.setDataQualityStatus(columnQualityStatusModel != null ? columnQualityStatusModel.shallowCloneWithoutChecks() : null);
340+
listModel.setDataQualityStatus(columnQualityStatusModel != null ?
341+
columnQualityStatusModel.shallowCloneWithoutChecks() : null);
340342
}
341343
}
342344
return listModel;

0 commit comments

Comments
 (0)