[MODAUD-174] - Fixed sql query

mod-audit-server/src/main/java/org/folio/dao/acquisition/impl/PieceEventsDaoImpl.java

@@ -11,6 +11,7 @@
 import static org.folio.util.AuditEventDBConstants.PIECE_ID_FIELD;
 import static org.folio.util.AuditEventDBConstants.TOTAL_RECORDS_FIELD;
 import static org.folio.util.AuditEventDBConstants.USER_ID_FIELD;
+import static org.folio.util.DbUtils.formatDBTableName;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -37,14 +38,15 @@ public class PieceEventsDaoImpl implements PieceEventsDao {
   private static final String TABLE_NAME = "acquisition_piece_log";
   private static final String GET_BY_PIECE_ID_SQL = "SELECT id, action, piece_id, user_id, event_date, action_date, modified_content_snapshot,  " +
     " (SELECT count(*) AS total_records FROM %s WHERE piece_id = $1) FROM %s WHERE piece_id = $1 %s LIMIT $2 OFFSET $3";
-  private static final String GET_STATUS_CHANGE_HISTORY_BY_PIECE_ID_SQL = """
+  private static final String GET_STATUS_CHANGE_HISTORY_BY_PIECE_ID_SQL =
+    """
     WITH StatusChanges AS (SELECT id, action, piece_id, user_id, event_date, action_date, modified_content_snapshot,
-     LAG(modified_content_snapshot ->> 'status') OVER (PARTITION BY piece_id ORDER BY action_date) AS previous_status FROM %s
+     LAG(modified_content_snapshot ->> 'receivingStatus') OVER (PARTITION BY piece_id ORDER BY action_date) AS previous_status FROM %s
     )
     SELECT id, action, piece_id, user_id, event_date,	action_date, modified_content_snapshot,
      (SELECT COUNT(*) AS total_records FROM StatusChanges
-     WHERE piece_id = $1 and modified_content_snapshot ->> 'status' <> COALESCE(previous_status, ''))
-    FROM StatusChanges WHERE piece_id = $1 and modified_content_snapshot ->> 'status' <> COALESCE(previous_status, '')
+     WHERE piece_id = $1 and modified_content_snapshot ->> 'receivingStatus' <> COALESCE(previous_status, ''))
+    FROM StatusChanges WHERE piece_id = $1 and modified_content_snapshot ->> 'receivingStatus' <> COALESCE(previous_status, '')
     %s LIMIT $2 OFFSET $3
     """;
 
@@ -62,6 +64,7 @@ public Future<RowSet<Row>> save(PieceAuditEvent pieceAuditEvent, String tenantId
     LOGGER.debug("save:: Trying to save Piece AuditEvent with tenant id : {}", tenantId);
     Promise<RowSet<Row>> promise = Promise.promise();
 
+    LOGGER.debug("formatDBTableName:: Formatting DB Table Name with tenant id : {}", tenantId);
     String logTable = formatDBTableName(tenantId, TABLE_NAME);
     String query = format(INSERT_SQL, logTable);
 
@@ -75,6 +78,7 @@ public Future<PieceAuditEventCollection> getAuditEventsByPieceId(String pieceId,
     LOGGER.debug("getAuditEventsByOrderId:: Trying to retrieve AuditEvent with piece id : {}", pieceId);
     Promise<RowSet<Row>> promise = Promise.promise();
     try {
+      LOGGER.debug("formatDBTableName:: Formatting DB Table Name with tenant id : {}", tenantId);
       String logTable = formatDBTableName(tenantId, TABLE_NAME);
       String query = format(GET_BY_PIECE_ID_SQL, logTable, logTable, format(ORDER_BY_PATTERN, sortBy, sortOrder));
       Tuple queryParams = Tuple.of(UUID.fromString(pieceId), limit, offset);
@@ -94,7 +98,7 @@ public Future<PieceAuditEventCollection> getAuditEventsWithStatusChangesByPieceI
     LOGGER.debug("getAuditEventsByOrderId:: Retrieving AuditEvent with piece id : {}", pieceId);
     Promise<RowSet<Row>> promise = Promise.promise();
     try {
-      LOGGER.info("getAuditEventsByOrderId:: Trying to Retrieve AuditEvent with piece id : {}", pieceId);
+      LOGGER.debug("formatDBTableName:: Formatting DB Table Name with tenant id : {}", tenantId);
       String logTable = formatDBTableName(tenantId, TABLE_NAME);
       String query = format(GET_STATUS_CHANGE_HISTORY_BY_PIECE_ID_SQL, logTable, format(ORDER_BY_PATTERN, sortBy, sortOrder));
       Tuple queryParams = Tuple.of(UUID.fromString(pieceId), limit, offset);
@@ -149,8 +153,4 @@ private void makeSaveCall(Promise<RowSet<Row>> promise, String query, PieceAudit
     }
   }
 
-  private String formatDBTableName(String tenantId, String table) {
-    LOGGER.debug("formatDBTableName:: Formatting DB Table Name with tenant id : {}", tenantId);
-    return format("%s.%s", convertToPsqlStandard(tenantId), table);
-  }
 }

mod-audit-server/src/main/java/org/folio/util/DbUtils.java

@@ -0,0 +1,11 @@
+package org.folio.util;
+
+import static java.lang.String.format;
+import static org.folio.rest.persist.PostgresClient.convertToPsqlStandard;
+
+public class DbUtils {
+
+  public static String formatDBTableName(String tenantId, String table) {
+    return format("%s.%s", convertToPsqlStandard(tenantId), table);
+  }
+}