[MODFISTO-460] Removed the old transaction API (#408)

folio-org · Apr 22, 2024 · 82eb073 · 82eb073
1 parent 98ad5f2
commit 82eb073
Show file tree

Hide file tree

Showing 110 changed files with 2,237 additions and 9,353 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -412,92 +412,25 @@
     },
     {
       "id": "finance-storage.transactions",
-      "version": "4.1",
+      "version": "5.0",
       "handlers": [
         {
           "methods": ["GET"],
           "pathPattern": "/finance-storage/transactions",
           "permissionsRequired": ["finance-storage.transactions.collection.get"]
         },
-        {
-          "methods": ["POST"],
-          "pathPattern": "/finance-storage/transactions",
-          "permissionsRequired": ["finance-storage.transactions.item.post"]
-        },
         {
           "methods": ["GET"],
           "pathPattern": "/finance-storage/transactions/{id}",
           "permissionsRequired": ["finance-storage.transactions.item.get"]
         },
-        {
-          "methods": ["PUT"],
-          "pathPattern": "/finance-storage/transactions/{id}",
-          "permissionsRequired": ["finance-storage.transactions.item.put"]
-        },
-        {
-          "methods": ["DELETE"],
-          "pathPattern": "/finance-storage/transactions/{id}",
-          "permissionsRequired": ["finance-storage.transactions.item.delete"]
-        },
         {
           "methods": ["POST"],
           "pathPattern": "/finance-storage/transactions/batch-all-or-nothing",
           "permissionsRequired": ["finance-storage.transactions.batch"]
         }
       ]
     },
-    {
-      "id": "finance-storage.order-transaction-summaries",
-      "version": "1.1",
-      "handlers": [
-        {
-          "methods": ["POST"],
-          "pathPattern": "/finance-storage/order-transaction-summaries",
-          "permissionsRequired": ["finance-storage.order-transaction-summaries.item.post"]
-        },
-        {
-          "methods": ["GET"],
-          "pathPattern": "/finance-storage/order-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.order-transaction-summaries.item.get"]
-        },
-        {
-          "methods": ["PUT"],
-          "pathPattern": "/finance-storage/order-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.order-transaction-summaries.item.put"]
-        },
-        {
-          "methods": ["DELETE"],
-          "pathPattern": "/finance-storage/order-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.order-transaction-summaries.item.delete"]
-        }
-      ]
-    },
-    {
-      "id": "finance-storage.invoice-transaction-summaries",
-      "version": "2.1",
-      "handlers": [
-        {
-          "methods": ["POST"],
-          "pathPattern": "/finance-storage/invoice-transaction-summaries",
-          "permissionsRequired": ["finance-storage.invoice-transaction-summaries.item.post"]
-        },
-        {
-          "methods": ["GET"],
-          "pathPattern": "/finance-storage/invoice-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.invoice-transaction-summaries.item.get"]
-        },
-        {
-          "methods": ["PUT"],
-          "pathPattern": "/finance-storage/invoice-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.invoice-transaction-summaries.item.put"]
-        },
-        {
-          "methods": ["DELETE"],
-          "pathPattern": "/finance-storage/invoice-transaction-summaries/{id}",
-          "permissionsRequired": ["finance-storage.invoice-transaction-summaries.item.delete"]
-        }
-      ]
-    },
     {
       "id" : "_tenant",
       "version" : "2.0",
@@ -963,26 +896,11 @@
       "displayName" : "finance-storage.transactions.-collection get",
       "description" : "Get collection of transactions"
     },
-    {
-      "permissionName" : "finance-storage.transactions.item.post",
-      "displayName" : "finance-storage.transactions.-item post",
-      "description" : "Create a new transaction"
-    },
     {
       "permissionName" : "finance-storage.transactions.item.get",
       "displayName" : "finance-storage.transactions.-item get",
       "description" : "Fetch a transaction"
     },
-    {
-      "permissionName" : "finance-storage.transactions.item.put",
-      "displayName" : "finance-storage.transactions.-item put",
-      "description" : "Update a transaction"
-    },
-    {
-      "permissionName" : "finance-storage.transactions.item.delete",
-      "displayName" : "finance-storage.transactions.-item delete",
-      "description" : "Delete a transaction"
-    },
     {
       "permissionName" : "finance-storage.transactions.batch",
       "displayName" : "process transactions in batch",
@@ -994,75 +912,10 @@
       "description" : "All permissions for the transaction",
       "subPermissions" : [
         "finance-storage.transactions.collection.get",
-        "finance-storage.transactions.item.post",
         "finance-storage.transactions.item.get",
-        "finance-storage.transactions.item.put",
-        "finance-storage.transactions.item.delete",
         "finance-storage.transactions.batch"
       ]
     },
-    {
-      "permissionName" : "finance-storage.order-transaction-summaries.item.get",
-      "displayName" : "Retrieve a new order transaction summary record",
-      "description" : "Retrieve a new order transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.order-transaction-summaries.item.post",
-      "displayName" : "Create a new order transaction summary record",
-      "description" : "Create a new order transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.order-transaction-summaries.item.put",
-      "displayName" : "Update order transaction summary record",
-      "description" : "Update order transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.order-transaction-summaries.item.delete",
-      "displayName" : "Delete a new order transaction summary record",
-      "description" : "Delete a new order transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.order-transaction-summaries.all",
-      "displayName" : "All order transaction summary perms",
-      "description" : "All permissions for the order transaction summary",
-      "subPermissions" : [
-        "finance-storage.order-transaction-summaries.item.get",
-        "finance-storage.order-transaction-summaries.item.post",
-        "finance-storage.order-transaction-summaries.item.put",
-        "finance-storage.order-transaction-summaries.item.delete"
-      ]
-    },
-    {
-      "permissionName" : "finance-storage.invoice-transaction-summaries.item.get",
-      "displayName" : "Retrieve an invoice transaction summary record",
-      "description" : "Retrieve an invoice transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.invoice-transaction-summaries.item.post",
-      "displayName" : "Create a new invoice transaction summary record",
-      "description" : "Create a new invoice transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.invoice-transaction-summaries.item.put",
-      "displayName" : "Update invoice transaction summary record",
-      "description" : "Update invoice transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.invoice-transaction-summaries.item.delete",
-      "displayName" : "Delete an invoice transaction summary record",
-      "description" : "Delete an  invoice transaction summary record"
-    },
-    {
-      "permissionName" : "finance-storage.invoice-transaction-summaries.all",
-      "displayName" : "All invoice transaction summary perms",
-      "description" : "All permissions for the invoice transaction summary",
-      "subPermissions" : [
-        "finance-storage.invoice-transaction-summaries.item.get",
-        "finance-storage.invoice-transaction-summaries.item.post",
-        "finance-storage.invoice-transaction-summaries.item.put",
-        "finance-storage.invoice-transaction-summaries.item.delete"
-      ]
-    },
     {
       "permissionName" : "finance.module.all",
       "displayName" : "All finance-module perms",
@@ -1076,9 +929,7 @@
         "finance-storage.groups.all",
         "finance-storage.ledgers.all",
         "finance-storage.transactions.all",
-        "finance-storage.fund-types.all",
-        "finance-storage.order-transaction-summaries.all",
-        "finance-storage.invoice-transaction-summaries.all"
+        "finance-storage.fund-types.all"
       ]
     }
   ],

diff --git a/ramls/transaction-summary.raml b/ramls/transaction-summary.raml
diff --git a/ramls/transaction.raml b/ramls/transaction.raml
@@ -1,7 +1,7 @@
 #%RAML 1.0
 title: "mod-finance-storage"
 baseUri: https://github.com/folio-org/mod-finance-storage
-version: v3
+version: v4
 
 documentation:
   - title: mod-finance-storage (Transactions)
@@ -22,20 +22,15 @@ traits:
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:
-  collection: !include raml-util/rtypes/collection.raml
-  collection-item: !include raml-util/rtypes/item-collection.raml
+  collection-get: !include raml-util/rtypes/collection-get.raml
+  collection-item-get: !include raml-util/rtypes/item-collection-get-with-json-response.raml
 
 
 /finance-storage/transactions:
   type:
-    collection:
+    collection-get:
       exampleCollection: !include acq-models/mod-finance/examples/transaction_collection.sample
-      exampleItem: !include acq-models/mod-finance/examples/transaction.sample
       schemaCollection: transaction-collection
-      schemaItem: transaction
-  post:
-    description: Deprecated for encumbrances, pending payments, payments and credits - use batch-all-or-nothing instead.
-    is: [validate]
   get:
     description: Get list of transactions
     is: [
@@ -48,12 +43,9 @@ resourceTypes:
         description: The UUID of a transaction
         type: UUID
     type:
-      collection-item:
+      collection-item-get:
         exampleItem: !include acq-models/mod-finance/examples/transaction.sample
         schema: transaction
-    put:
-      description: Deprecated for encumbrances, pending payments, payments and credits - use batch-all-or-nothing instead.
-      is: [validate]
   /batch-all-or-nothing:
     displayName: Batch processing of transactions
     post:

diff --git a/src/main/java/org/folio/builders/error/NameCodeConstraintErrorBuilder.java b/src/main/java/org/folio/builders/error/NameCodeConstraintErrorBuilder.java
@@ -7,7 +7,7 @@
 
 import javax.ws.rs.core.Response;
 
-import io.vertx.ext.web.handler.HttpException;
+import org.folio.rest.exception.HttpException;
 import io.vertx.pgclient.PgException;
 import org.folio.rest.persist.HelperUtils;
 import org.folio.rest.persist.PgExceptionUtil;
@@ -20,9 +20,8 @@ public class NameCodeConstraintErrorBuilder {
 
   public  <T> HttpException buildException(AsyncResult<T> reply, Class<?> clazz ) {
     Throwable cause = reply.cause();
-    if (cause instanceof PgException && "23F09".equals(((PgException)cause).getCode())) {
-      String message = MessageFormat.format(ErrorCodes.CONFLICT.getDescription(), ((PgException)cause).getTable(),
-        ((PgException)cause).getErrorMessage());
+    if (cause instanceof PgException pgEx && PgExceptionUtil.isVersionConflict(pgEx)) {
+      String message = MessageFormat.format(ErrorCodes.CONFLICT.getDescription(), pgEx.getTable(), pgEx.getErrorMessage());
       return new HttpException(Response.Status.CONFLICT.getStatusCode(), message);
     }
     String error = convertExceptionToStringError(reply, clazz);