Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MODFIN-352] Removed old transaction API #245

Merged
merged 5 commits into from
Apr 16, 2024
Merged

[MODFIN-352] Removed old transaction API #245

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f454be7
[MODFIN-352] Removed old transaction API
damien-git Apr 10, 2024
1411dce
[MODFIN-352] Fixed code smell
damien-git Apr 10, 2024
af8db80
[MODFIN-352] Removed HTML tags from RAML descriptions
damien-git Apr 10, 2024
7ddd308
[MODFIN-352] Minor fix
damien-git Apr 10, 2024
cc5d8e7
Merge branch 'master' into MODFIN-352
damien-git Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 7 additions & 220 deletions descriptors/ModuleDescriptor-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"finance-storage.budgets.collection.get",
"finance-storage.group-fund-fiscal-years.collection.get",
"finance-storage.group-fund-fiscal-years.item.put",
"finance-storage.transactions.item.post",
"finance-storage.fiscal-years.item.get",
"finance-storage.fiscal-years.collection.get",
"finance-storage.budget-expense-classes.collection.get",
"finance-storage.budget-expense-classes.item.post",
"finance-storage.funds.item.get",
"finance-storage.ledgers.item.get",
"finance-storage.transactions.batch",
"configuration.entries.collection.get"
]
},
Expand Down Expand Up @@ -599,102 +599,24 @@
},
{
"id": "finance.transactions",
"version": "5.1",
"version": "6.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before merge need to increate dependent UI version, will ask @usavkov-epam to apply this change

"handlers": [
{
"methods": ["POST"],
"pathPattern": "/finance/allocations",
"permissionsRequired": ["finance.allocations.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post",
"finance-storage.funds.item.get"
]
},
{
"methods": ["POST"],
"pathPattern": "/finance/encumbrances",
"permissionsRequired": ["finance.encumbrances.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/encumbrances/{id}",
"permissionsRequired": ["finance.encumbrances.item.put"],
"modulePermissions": [
"finance-storage.transactions.item.put"
]
},
{
"methods": ["DELETE"],
"pathPattern": "/finance/encumbrances/{id}",
"permissionsRequired": ["finance.encumbrances.item.delete"],
"modulePermissions": [
"finance-storage.transactions.item.get",
"finance-storage.transactions.item.put",
"finance-storage.transactions.item.delete",
"finance-storage.transactions.collection.get",
"finance-storage.order-transaction-summaries.item.put"
"finance-storage.funds.item.get",
"finance-storage.transactions.batch"
]
},
{
"methods": ["POST"],
"pathPattern": "/finance/transfers",
"permissionsRequired": ["finance.transfers.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post",
"finance-storage.funds.item.get"
]
},
{
"methods": ["POST"],
"pathPattern": "/finance/payments",
"permissionsRequired": ["finance.payments.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/payments/{id}",
"permissionsRequired": ["finance.payments.item.put"],
"modulePermissions": [
"finance-storage.transactions.item.put",
"finance-storage.transactions.item.get"
]
},
{
"methods": ["POST"],
"pathPattern": "/finance/pending-payments",
"permissionsRequired": ["finance.pending-payments.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/pending-payments/{id}",
"permissionsRequired": ["finance.pending-payments.item.put"],
"modulePermissions": [
"finance-storage.transactions.item.put"
]
},
{
"methods": ["POST"],
"pathPattern": "/finance/credits",
"permissionsRequired": ["finance.credits.item.post"],
"modulePermissions": [
"finance-storage.transactions.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/credits/{id}",
"permissionsRequired": ["finance.credits.item.put"],
"modulePermissions": [
"finance-storage.transactions.item.put",
"finance-storage.transactions.item.get"
"finance-storage.funds.item.get",
"finance-storage.transactions.batch"
]
},
{
Expand Down Expand Up @@ -742,28 +664,6 @@
}
]
},
{
"id": "finance.order-transaction-summaries",
"version": "1.2",
"handlers": [
{
"methods": ["POST"],
"pathPattern": "/finance/order-transaction-summaries",
"permissionsRequired": ["finance.order-transaction-summaries.item.post"],
"modulePermissions": [
"finance-storage.order-transaction-summaries.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/order-transaction-summaries/{id}",
"permissionsRequired": ["finance.order-transaction-summaries.item.put"],
"modulePermissions": [
"finance-storage.order-transaction-summaries.item.put"
]
}
]
},
{
"id": "finance.group-fiscal-year-summaries",
"version": "1.3",
Expand All @@ -780,28 +680,6 @@
}
]
},
{
"id": "finance.invoice-transaction-summaries",
"version": "2.1",
"handlers": [
{
"methods": ["POST"],
"pathPattern": "/finance/invoice-transaction-summaries",
"permissionsRequired": ["finance.invoice-transaction-summaries.item.post"],
"modulePermissions": [
"finance-storage.invoice-transaction-summaries.item.post"
]
},
{
"methods": ["PUT"],
"pathPattern": "/finance/invoice-transaction-summaries/{id}",
"permissionsRequired": ["finance.invoice-transaction-summaries.item.put"],
"modulePermissions": [
"finance-storage.invoice-transaction-summaries.item.put"
]
}
]
},
{
"id": "finance.exchange-rate",
"version": "1.0",
Expand Down Expand Up @@ -912,20 +790,12 @@
},
{
"id": "finance-storage.transactions",
"version":"4.0"
"version":"4.1"
},
{
"id": "configuration",
"version":"2.0"
},
{
"id": "finance-storage.order-transaction-summaries",
"version":"1.1"
},
{
"id": "finance-storage.invoice-transaction-summaries",
"version":"2.1"
},
{
"id": "finance-storage.ledger-rollovers",
"version":"2.0"
Expand Down Expand Up @@ -1328,56 +1198,11 @@
"displayName" : "Allocations - create a new transaction of type allocation",
"description" : "Create a new allocation"
},
{
"permissionName" : "finance.encumbrances.item.post",
"displayName" : "Encumbrances - create a new transaction of type encumbrance",
"description" : "Create a new encumbrance"
},
{
"permissionName" : "finance.encumbrances.item.put",
"displayName" : "Encumbrances - update transaction of type encumbrance",
"description" : "Update an encumbrance"
},
{
"permissionName" : "finance.encumbrances.item.delete",
"displayName" : "Encumbrances - delete transaction of type encumbrance",
"description" : "Delete an encumbrance"
},
{
"permissionName" : "finance.transfers.item.post",
"displayName" : "Transfers - create a new transaction of type transfer",
"description" : "Create a new transfer"
},
{
"permissionName" : "finance.payments.item.post",
"displayName" : "Payments - create a new transaction of type payment",
"description" : "Create a new payment"
},
{
"permissionName" : "finance.payments.item.put",
"displayName" : "Payments - update a transaction of type payment",
"description" : "Update a payment"
},
{
"permissionName" : "finance.pending-payments.item.post",
"displayName" : "Pending payments - create a new transaction of type pending payment",
"description" : "Create a new pending payment"
},
{
"permissionName" : "finance.pending-payments.item.put",
"displayName" : "Pending payments - update a transaction of type pending payment",
"description" : "Update a pending payment"
},
{
"permissionName" : "finance.credits.item.post",
"displayName" : "Credits - create a new transaction of type credit",
"description" : "Create a new credit"
},
{
"permissionName" : "finance.credits.item.put",
"displayName" : "Credits - update a transaction of type credit",
"description" : "Update a credit"
},
{
"permissionName": "finance.transactions.collection.get",
"displayName": "Finances - Get finance transaction collection",
Expand All @@ -1399,16 +1224,7 @@
"description" : "All permissions for the transaction APIs",
"subPermissions" : [
"finance.allocations.item.post",
"finance.encumbrances.item.post",
"finance.encumbrances.item.put",
"finance.encumbrances.item.delete",
"finance.transfers.item.post",
"finance.payments.item.post",
"finance.payments.item.put",
"finance.pending-payments.item.post",
"finance.pending-payments.item.put",
"finance.credits.item.post",
"finance.credits.item.put",
"finance.transactions.collection.get",
"finance.transactions.item.get",
"finance.release-encumbrance.item.post",
Expand All @@ -1431,31 +1247,6 @@
"displayName": "Finances - get group fiscal year summaries",
"description": "Get group fiscal year summaries collection"
},
{
"permissionName" : "finance.order-transaction-summaries.item.post",
"displayName" : "Finances - Post Order transaction Summaries",
"description" : "Post Order Transaction Summary"
},
{
"permissionName" : "finance.order-transaction-summaries.item.put",
"displayName" : "Finances - Put Order transaction Summaries",
"description" : "Put Order Transaction Summary"
},
{
"permissionName" : "finance.order-transaction-summaries.item.get",
"displayName" : "Finances - Get Order transaction Summaries",
"description" : "Get Order Transaction Summary"
},
{
"permissionName" : "finance.invoice-transaction-summaries.item.post",
"displayName" : "Finances - Post Invoice transaction Summaries",
"description" : "Post Invoice Transaction Summary"
},
{
"permissionName" : "finance.invoice-transaction-summaries.item.put",
"displayName" : "Finances - Put Invoice transaction Summaries",
"description" : "Put Invoice Transaction Summary"
},
{
"permissionName" : "finance.exchange-rate.item.get",
"displayName" : "Finances - Exchange Rate",
Expand Down Expand Up @@ -1486,10 +1277,6 @@
"finance.transactions.all",
"finance.fund-codes-expense-classes.collection.get",
"finance.group-fiscal-year-summaries.collection.get",
"finance.order-transaction-summaries.item.post",
"finance.order-transaction-summaries.item.put",
"finance.invoice-transaction-summaries.item.post",
"finance.invoice-transaction-summaries.item.put",
"finance.exchange-rate.item.get",
"finance.calculate-exchange.item.get",
"finance.expense-classes.all",
Expand Down
6 changes: 3 additions & 3 deletions ramls/release-encumbrance.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ documentation:
- title: Release encumbrance API
content: |
This documents the API calls that release any remaining money encumbered back to the budget's available pool.
It should only be used by the UI, and only to release a single encumbrance - <tt>batch-all-or-nothing</tt> should be used otherwise.
It should only be used by the UI, and only to release a single encumbrance - batch-all-or-nothing should be used otherwise.

types:
errors: !include raml-util/schemas/errors.schema
Expand All @@ -28,10 +28,10 @@ traits:
displayName: Finance release encumbrance
description: |
Finance release encumbrance APIs.
It should only be used by the UI, and only to release a single encumbrance - <tt>batch-all-or-nothing</tt> should be used otherwise.
It should only be used by the UI, and only to release a single encumbrance - batch-all-or-nothing should be used otherwise.
post:
is: [validate]
description: Release encumbrance (use only in UI for a single encumbrance - use <tt>batch-all-or-nothing</tt> otherwise)
description: Release encumbrance (use only in UI for a single encumbrance - use batch-all-or-nothing otherwise)
responses:
204:
description: "Encumbrance successfully released"
Expand Down
Loading
Loading