-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MODAUD-196]. Implement consumer & endpoint for invoice line records
- Loading branch information
1 parent
727953c
commit 85d0446
Showing
23 changed files
with
832 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
mod-audit-server/src/main/java/org/folio/dao/acquisition/InvoiceLineEventsDao.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.folio.dao.acquisition; | ||
|
|
||
| import io.vertx.core.Future; | ||
| import io.vertx.sqlclient.Row; | ||
| import io.vertx.sqlclient.RowSet; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEvent; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEventCollection; | ||
|
|
||
| public interface InvoiceLineEventsDao { | ||
|
|
||
| /** | ||
| * Saves invoiceLineAuditEvent entity to DB | ||
| * | ||
| * @param invoiceLineAuditEvent InvoiceLineAuditEvent entity to save | ||
| * @param tenantId tenant id | ||
| * @return future with created row | ||
| */ | ||
| Future<RowSet<Row>> save(InvoiceLineAuditEvent invoiceLineAuditEvent, String tenantId); | ||
|
|
||
| /** | ||
| * Searches for invoice_line audit events by id | ||
| * | ||
| * @param invoiceLineId invoice_line id | ||
| * @param sortBy sort by | ||
| * @param sortOrder sort order | ||
| * @param limit limit | ||
| * @param offset offset | ||
| * @param tenantId tenant id | ||
| * @return future with InvoiceLineAuditEventCollection | ||
| */ | ||
| Future<InvoiceLineAuditEventCollection> getAuditEventsByInvoiceLineId(String invoiceLineId, String sortBy, String sortOrder, int limit, int offset, String tenantId); | ||
| } |
129 changes: 129 additions & 0 deletions
129
mod-audit-server/src/main/java/org/folio/dao/acquisition/impl/InvoiceLineEventsDaoImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package org.folio.dao.acquisition.impl; | ||
|
|
||
| import static java.lang.String.format; | ||
| import static org.folio.util.AuditEventDBConstants.ACTION_DATE_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.ACTION_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.EVENT_DATE_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.ID_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.INVOICE_ID_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.INVOICE_LINE_ID_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.MODIFIED_CONTENT_FIELD; | ||
| import static org.folio.util.AuditEventDBConstants.ORDER_BY_PATTERN; | ||
| 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.ZoneId; | ||
| import java.time.ZoneOffset; | ||
| import java.util.Date; | ||
| import java.util.UUID; | ||
|
|
||
| import io.vertx.core.Future; | ||
| import io.vertx.core.Promise; | ||
| import io.vertx.core.json.JsonObject; | ||
| import io.vertx.sqlclient.Row; | ||
| import io.vertx.sqlclient.RowSet; | ||
| import io.vertx.sqlclient.Tuple; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.folio.dao.acquisition.InvoiceLineEventsDao; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEvent; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEventCollection; | ||
| import org.folio.util.PostgresClientFactory; | ||
| import org.springframework.stereotype.Repository; | ||
|
|
||
| @Repository | ||
| public class InvoiceLineEventsDaoImpl implements InvoiceLineEventsDao { | ||
|
|
||
| private static final Logger LOGGER = LogManager.getLogger(); | ||
|
|
||
| public static final String TABLE_NAME = "acquisition_invoice_line_log"; | ||
|
|
||
| public static final String GET_BY_INVOICE_LINE_ID_SQL = "SELECT id, action, invoice_id, invoice_line_id, user_id, event_date, action_date, modified_content_snapshot," + | ||
| " (SELECT count(*) AS total_records FROM %s WHERE invoice_line_id = $1) " + | ||
| " FROM %s WHERE invoice_line_id = $1 %s LIMIT $2 OFFSET $3"; | ||
|
|
||
| private static final String INSERT_SQL = "INSERT INTO %s (id, action, invoice_id, invoice_line_id, user_id, event_date, action_date, modified_content_snapshot) " + | ||
| "VALUES ($1, $2, $3, $4, $5, $6, $7, $8)"; | ||
|
|
||
| private final PostgresClientFactory pgClientFactory; | ||
|
|
||
| public InvoiceLineEventsDaoImpl(PostgresClientFactory pgClientFactory) { | ||
| this.pgClientFactory = pgClientFactory; | ||
| } | ||
|
|
||
| @Override | ||
| public Future<RowSet<Row>> save(InvoiceLineAuditEvent invoiceLineAuditEvent, String tenantId) { | ||
| LOGGER.debug("save:: Saving InvoiceLine 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); | ||
| makeSaveCall(promise, query, invoiceLineAuditEvent, tenantId); | ||
| LOGGER.info("save:: Saved InvoiceLine AuditEvent with tenant id : {}", tenantId); | ||
| return promise.future(); | ||
| } | ||
|
|
||
| @Override | ||
| public Future<InvoiceLineAuditEventCollection> getAuditEventsByInvoiceLineId(String invoiceLineId, String sortBy, String sortOrder, int limit, int offset, String tenantId) { | ||
| LOGGER.debug("getAuditEventsByInvoiceLineId:: Retrieving AuditEvent with invoice line id : {}", invoiceLineId); | ||
| 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_INVOICE_LINE_ID_SQL, logTable, logTable, format(ORDER_BY_PATTERN, sortBy, sortOrder)); | ||
| Tuple queryParams = Tuple.of(UUID.fromString(invoiceLineId), limit, offset); | ||
| pgClientFactory.createInstance(tenantId).selectRead(query, queryParams, promise); | ||
| } catch (Exception e) { | ||
| LOGGER.warn("Error getting invoice line audit events by invoice line id: {}", invoiceLineId, e); | ||
| promise.fail(e); | ||
| } | ||
|
|
||
| LOGGER.info("getAuditEventsByInvoiceLineId:: Retrieved AuditEvent with invoice line id : {}", invoiceLineId); | ||
| return promise.future().map(rowSet -> rowSet.rowCount() == 0 ? new InvoiceLineAuditEventCollection().withTotalItems(0) | ||
| : mapRowToListOfInvoiceLineEvent(rowSet)); | ||
| } | ||
|
|
||
| private void makeSaveCall(Promise<RowSet<Row>> promise, String query, InvoiceLineAuditEvent invoiceLineAuditEvent, String tenantId) { | ||
| LOGGER.debug("makeSaveCall:: Making save call with query : {} and tenant id : {}", query, tenantId); | ||
| try { | ||
| pgClientFactory.createInstance(tenantId).execute(query, Tuple.of(invoiceLineAuditEvent.getId(), | ||
| invoiceLineAuditEvent.getAction(), | ||
| invoiceLineAuditEvent.getInvoiceId(), | ||
| invoiceLineAuditEvent.getInvoiceLineId(), | ||
| invoiceLineAuditEvent.getUserId(), | ||
| LocalDateTime.ofInstant(invoiceLineAuditEvent.getEventDate().toInstant(), ZoneId.systemDefault()), | ||
| LocalDateTime.ofInstant(invoiceLineAuditEvent.getActionDate().toInstant(), ZoneId.systemDefault()), | ||
| JsonObject.mapFrom(invoiceLineAuditEvent.getInvoiceLineSnapshot())), promise); | ||
| } catch (Exception e) { | ||
| LOGGER.error("Failed to save record with id: {} for invoice line id: {} in to table {}", | ||
| invoiceLineAuditEvent.getId(), invoiceLineAuditEvent.getInvoiceLineId(), TABLE_NAME, e); | ||
| promise.fail(e); | ||
| } | ||
| } | ||
|
|
||
| private InvoiceLineAuditEventCollection mapRowToListOfInvoiceLineEvent(RowSet<Row> rowSet) { | ||
| LOGGER.debug("mapRowToListOfInvoiceLineEvent:: Mapping row to List of Invoice Line Events"); | ||
| InvoiceLineAuditEventCollection invoiceLineAuditEventCollection = new InvoiceLineAuditEventCollection(); | ||
| rowSet.iterator().forEachRemaining(row -> { | ||
| invoiceLineAuditEventCollection.getInvoiceLineAuditEvents().add(mapRowToInvoiceLineEvent(row)); | ||
| invoiceLineAuditEventCollection.setTotalItems(row.getInteger(TOTAL_RECORDS_FIELD)); | ||
| }); | ||
| LOGGER.debug("mapRowToListOfInvoiceLineEvent:: Mapped row to List of Invoice Line Events"); | ||
| return invoiceLineAuditEventCollection; | ||
| } | ||
|
|
||
| private InvoiceLineAuditEvent mapRowToInvoiceLineEvent(Row row) { | ||
| LOGGER.debug("mapRowToInvoiceLineEvent:: Mapping row to Invoice Line Event"); | ||
| return new InvoiceLineAuditEvent() | ||
| .withId(row.getValue(ID_FIELD).toString()) | ||
| .withAction(row.get(InvoiceLineAuditEvent.Action.class, ACTION_FIELD)) | ||
| .withInvoiceId(row.getValue(INVOICE_ID_FIELD).toString()) | ||
| .withInvoiceLineId(row.getValue(INVOICE_LINE_ID_FIELD).toString()) | ||
| .withUserId(row.getValue(USER_ID_FIELD).toString()) | ||
| .withEventDate(Date.from(row.getLocalDateTime(EVENT_DATE_FIELD).toInstant(ZoneOffset.UTC))) | ||
| .withActionDate(Date.from(row.getLocalDateTime(ACTION_DATE_FIELD).toInstant(ZoneOffset.UTC))) | ||
| .withInvoiceLineSnapshot(JsonObject.mapFrom(row.getValue(MODIFIED_CONTENT_FIELD))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...it-server/src/main/java/org/folio/services/acquisition/InvoiceLineAuditEventsService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.folio.services.acquisition; | ||
|
|
||
| import io.vertx.core.Future; | ||
| import io.vertx.sqlclient.Row; | ||
| import io.vertx.sqlclient.RowSet; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEvent; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEventCollection; | ||
|
|
||
| public interface InvoiceLineAuditEventsService { | ||
|
|
||
| /** | ||
| * Saves InvoiceLineAuditEvent | ||
| * | ||
| * @param invoiceLineAuditEvent invoice line event to save | ||
| * @param tenantId id of tenant | ||
| * @return successful future if event has not been processed, or failed future otherwise | ||
| */ | ||
| Future<RowSet<Row>> saveInvoiceLineAuditEvent(InvoiceLineAuditEvent invoiceLineAuditEvent, String tenantId); | ||
|
|
||
| /** | ||
| * Searches for invoice line audit events by invoice line id | ||
| * | ||
| * @param invoiceLineId invoice line id | ||
| * @param sortBy sort by | ||
| * @param sortOrder sort order | ||
| * @param limit limit | ||
| * @param offset offset | ||
| * @return future with InvoiceLineAuditEventCollection | ||
| */ | ||
| Future<InvoiceLineAuditEventCollection> getAuditEventsByInvoiceLineId(String invoiceLineId, String sortBy, String sortOrder, int limit, int offset, String tenantId); | ||
| } |
42 changes: 42 additions & 0 deletions
42
.../src/main/java/org/folio/services/acquisition/impl/InvoiceLineAuditEventsServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package org.folio.services.acquisition.impl; | ||
|
|
||
| import static org.folio.util.ErrorUtils.handleFailures; | ||
|
|
||
| import io.vertx.core.Future; | ||
| import io.vertx.sqlclient.Row; | ||
| import io.vertx.sqlclient.RowSet; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.folio.dao.acquisition.InvoiceLineEventsDao; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEvent; | ||
| import org.folio.rest.jaxrs.model.InvoiceLineAuditEventCollection; | ||
| import org.folio.services.acquisition.InvoiceLineAuditEventsService; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| public class InvoiceLineAuditEventsServiceImpl implements InvoiceLineAuditEventsService { | ||
|
|
||
| private static final Logger LOGGER = LogManager.getLogger(); | ||
|
|
||
| private final InvoiceLineEventsDao invoiceLineEventsDao; | ||
|
|
||
| public InvoiceLineAuditEventsServiceImpl(InvoiceLineEventsDao invoiceLineEventsDao) { | ||
| this.invoiceLineEventsDao = invoiceLineEventsDao; | ||
| } | ||
|
|
||
| @Override | ||
| public Future<RowSet<Row>> saveInvoiceLineAuditEvent(InvoiceLineAuditEvent invoiceLineAuditEvent, String tenantId) { | ||
| LOGGER.debug("saveInvoiceLineAuditEvent:: Saving invoice line audit event with id: {} in tenant Id : {}", invoiceLineAuditEvent.getId(), tenantId); | ||
| return invoiceLineEventsDao.save(invoiceLineAuditEvent, tenantId) | ||
| .recover(throwable -> { | ||
| LOGGER.error("handleFailures:: Could not save invoice audit event for InvoiceLine id: {} in tenantId: {}", invoiceLineAuditEvent.getInvoiceLineId(), tenantId); | ||
| return handleFailures(throwable, invoiceLineAuditEvent.getId()); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public Future<InvoiceLineAuditEventCollection> getAuditEventsByInvoiceLineId(String invoiceLineId, String sortBy, String sortOrder, int limit, int offset, String tenantId) { | ||
| LOGGER.debug("getAuditEventsByInvoiceLineId:: Retrieving audit events for invoice line Id : {} and tenant Id : {}", invoiceLineId, tenantId); | ||
| return invoiceLineEventsDao.getAuditEventsByInvoiceLineId(invoiceLineId, sortBy, sortOrder, limit, offset, tenantId); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.