Compare commits
No commits in common. "main" and "live_old_version_41" have entirely different histories.
main
...
live_old_v
|
|
@ -1,54 +0,0 @@
|
|||
-- Refinery (المصفاة): role REFINERY_OP (موظف عطاء الصرف) sees the الارساليات screen with the شحن الديزل (Excel) report, print and the
|
||||
-- payment actions. Safe to re-run; not run by the app.
|
||||
-- Run order: part 1 in the NTP schema (only needed where the role row is missing; it exists in the legacy data), part 2 in the primary
|
||||
-- (NAFITHTCS) schema, after db/grains-screen-permissions.sql. Afterwards assign role REFINERY_OP to the users who need it (NTPUSERS):
|
||||
-- they sign in as before. The API applies the rows within about a minute, the browser on the next reload / sign-in.
|
||||
-- SU needs no rows. Everything else of the refinery module (wage claims, commission claims, wallets, variables, cards, the other
|
||||
-- trip reports, the reverse-advance actions, recalculate balance) stays with REFINERY_MGR and SU.
|
||||
|
||||
-- ---------------------------------------------------------------------------------------------------------------------------
|
||||
-- Part 1 (NTP schema): the role row, copied from REFINERY_MGR (level, type, manager columns) when REFINERY_OP does not exist yet.
|
||||
-- ---------------------------------------------------------------------------------------------------------------------------
|
||||
INSERT INTO ROLES (CODE, NAME, DIRECTMANAGER, EMPLOYEES, MANAGERS, LEVELNUMBER, ROLETYPE, TENDER)
|
||||
SELECT 'REFINERY_OP', 'موظف عطاء الصرف', r.DIRECTMANAGER, r.EMPLOYEES, r.MANAGERS, r.LEVELNUMBER, r.ROLETYPE, r.TENDER
|
||||
FROM ROLES r
|
||||
WHERE r.CODE = 'REFINERY_MGR'
|
||||
AND NOT EXISTS (SELECT 1 FROM ROLES x WHERE x.CODE = 'REFINERY_OP');
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- ---------------------------------------------------------------------------------------------------------------------------
|
||||
-- Part 2 (primary schema): 13 keys.
|
||||
-- screen refinery.trips (list, view, history)
|
||||
-- report refinery.trips.dieselReport (شحن الديزل Excel)
|
||||
-- print refinery.trips.print (cash voucher)
|
||||
-- diesel refinery.trips.firstAdvance, secondAdvance
|
||||
-- cash refinery.trips.cashPayment, receipt
|
||||
-- bank / orange refinery.trips.payment, orangePayment
|
||||
-- e-wallet refinery.trips.exchange, exchangeAudit, activateWalletExchange, confirmExchange (Dinarak is OFF until configured)
|
||||
-- ---------------------------------------------------------------------------------------------------------------------------
|
||||
INSERT INTO GRAINS_SCREEN_PERMISSIONS (ROLECODE, RESOURCE_KEY)
|
||||
SELECT 'REFINERY_OP', v.resource_key
|
||||
FROM (SELECT 'refinery.trips' AS resource_key FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.dieselReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.print' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.firstAdvance' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.secondAdvance' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.cashPayment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.receipt' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.payment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.orangePayment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.exchange' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.exchangeAudit' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.activateWalletExchange' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.confirmExchange' FROM dual) v
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM GRAINS_SCREEN_PERMISSIONS p
|
||||
WHERE p.rolecode = 'REFINERY_OP' AND p.resource_key = v.resource_key);
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- Check (expect 13 rows):
|
||||
-- SELECT resource_key FROM GRAINS_SCREEN_PERMISSIONS WHERE rolecode = 'REFINERY_OP' ORDER BY resource_key;
|
||||
-- Take a right away by deleting its row, e.g.:
|
||||
-- DELETE FROM GRAINS_SCREEN_PERMISSIONS WHERE rolecode = 'REFINERY_OP' AND resource_key = 'refinery.trips.confirmExchange';
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
-- Refinery (المصفاة) modules ported from AqabaTCS: trips, wage claims, commission claims, wallets, variables, cards.
|
||||
-- Authority: SU (always allowed by the code, needs no row) and REFINERY_MGR (rows below: 6 screens + every action key).
|
||||
-- Run on a database where GRAINS_SCREEN_PERMISSIONS exists (db/grains-screen-permissions.sql). Safe to re-run. Not executed by the application.
|
||||
-- Delete a row to take a key away (the API applies it within about a minute, the browser on the next reload or sign-in).
|
||||
-- Give another role access: copy the block and change the role code.
|
||||
|
||||
INSERT INTO GRAINS_SCREEN_PERMISSIONS (ROLECODE, RESOURCE_KEY)
|
||||
SELECT 'REFINERY_MGR', v.resource_key
|
||||
FROM (SELECT 'refinery.trips' AS resource_key FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.firstAdvance' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.secondAdvance' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.firstAdvanceReverse' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.secondAdvanceReverse' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.exchange' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.exchangeAudit' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.receipt' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.payment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.activateWalletExchange' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.orangePayment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.cashPayment' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.confirmExchange' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.print' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.report' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.operatorReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.exchangeReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.dieselReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.cardsReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.bankReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.trips.recalculateBalance' FROM dual UNION ALL
|
||||
SELECT 'refinery.wageClaims' FROM dual UNION ALL
|
||||
SELECT 'refinery.wageClaims.create' FROM dual UNION ALL
|
||||
SELECT 'refinery.wageClaims.close' FROM dual UNION ALL
|
||||
SELECT 'refinery.wageClaims.transfer' FROM dual UNION ALL
|
||||
SELECT 'refinery.wageClaims.report' FROM dual UNION ALL
|
||||
SELECT 'refinery.commissionClaims' FROM dual UNION ALL
|
||||
SELECT 'refinery.commissionClaims.create' FROM dual UNION ALL
|
||||
SELECT 'refinery.commissionClaims.complete' FROM dual UNION ALL
|
||||
SELECT 'refinery.commissionClaims.report' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets.create' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets.update' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets.activate' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets.deactivate' FROM dual UNION ALL
|
||||
SELECT 'refinery.wallets.report' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables.create' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables.update' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables.tonPriceCorrection' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables.report' FROM dual UNION ALL
|
||||
SELECT 'refinery.variables.remainingBalanceReport' FROM dual UNION ALL
|
||||
SELECT 'refinery.cards' FROM dual UNION ALL
|
||||
SELECT 'refinery.cards.create' FROM dual UNION ALL
|
||||
SELECT 'refinery.cards.activate' FROM dual UNION ALL
|
||||
SELECT 'refinery.cards.deactivate' FROM dual UNION ALL
|
||||
SELECT 'refinery.cards.report' FROM dual) v
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM GRAINS_SCREEN_PERMISSIONS p
|
||||
WHERE p.rolecode = 'REFINERY_MGR' AND p.resource_key = v.resource_key);
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- Check (expect 47 rows):
|
||||
-- SELECT resource_key FROM GRAINS_SCREEN_PERMISSIONS WHERE rolecode = 'REFINERY_MGR' AND resource_key LIKE 'refinery.%' ORDER BY resource_key;
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
-- Registry Excel export rights (NAFITHTCS schema): who sees the "تصدير Excel" button of the trucks, trailers and drivers lists.
|
||||
-- The application has NO role list for this: only these rows decide (SU always may). Safe to re-run: a row is only inserted
|
||||
-- when it is not there yet. Not executed by the application.
|
||||
--
|
||||
-- Starting values copy the legacy screens (truckGrid.cfm / driverGrid.cfm):
|
||||
-- trucks, trailers : GTO, GOO, GNAC (+ CO, which has the same rights as GTO)
|
||||
-- drivers : GTO, GOO (+ CO)
|
||||
--
|
||||
-- To take a right away, delete the row; the API applies it within about a minute (permissions are cached per role for 60 seconds)
|
||||
-- and the user's browser picks it up on the next page reload or sign-in.
|
||||
|
||||
INSERT INTO GRAINS_SCREEN_PERMISSIONS (ROLECODE, RESOURCE_KEY)
|
||||
SELECT v.rolecode, v.resource_key
|
||||
FROM (
|
||||
SELECT 'GTO' AS rolecode, 'grains.registry.trucks.export' AS resource_key FROM dual UNION ALL
|
||||
SELECT 'GOO', 'grains.registry.trucks.export' FROM dual UNION ALL
|
||||
SELECT 'GNAC', 'grains.registry.trucks.export' FROM dual UNION ALL
|
||||
SELECT 'CO', 'grains.registry.trucks.export' FROM dual UNION ALL
|
||||
SELECT 'GTO', 'grains.registry.trailers.export' FROM dual UNION ALL
|
||||
SELECT 'GOO', 'grains.registry.trailers.export' FROM dual UNION ALL
|
||||
SELECT 'GNAC', 'grains.registry.trailers.export' FROM dual UNION ALL
|
||||
SELECT 'CO', 'grains.registry.trailers.export' FROM dual UNION ALL
|
||||
SELECT 'GTO', 'grains.registry.drivers.export' FROM dual UNION ALL
|
||||
SELECT 'GOO', 'grains.registry.drivers.export' FROM dual UNION ALL
|
||||
SELECT 'CO', 'grains.registry.drivers.export' FROM dual
|
||||
) v
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM GRAINS_SCREEN_PERMISSIONS p
|
||||
WHERE p.rolecode = v.rolecode AND p.resource_key = v.resource_key);
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- Check (expect 11 rows):
|
||||
-- SELECT rolecode, resource_key FROM GRAINS_SCREEN_PERMISSIONS WHERE resource_key LIKE 'grains.registry.%.export' ORDER BY 2, 1;
|
||||
|
|
@ -50,7 +50,6 @@ Apply these scripts once per database (not run by the application), in this orde
|
|||
|
||||
1. `db/grains-screen-permissions.sql` - role to screen/action permissions (`GRAINS_SCREEN_PERMISSIONS`)
|
||||
2. `db/registry-create-permissions.sql` - add / edit rights of trucks, trailers and drivers (safe to re-run)
|
||||
2b. `db/registry-export-permissions.sql` - Excel export rights of the trucks, trailers and drivers lists (`grains.registry.*.export`; without rows nobody but SU sees the button) (safe to re-run)
|
||||
3. `db/disabled-features.sql` - features switched OFF for everybody, SU included (safe to re-run)
|
||||
4. `db/permits-create-permission.sql` - right to register a turn (تسجيل دور) from the permits list, granted to GOO (safe to re-run)
|
||||
5. `db/menu-reorganisation.sql` - new طلبية التموين screen, GOO reports reduced to two, GOO loses ضبط الميزان (safe to re-run)
|
||||
|
|
@ -58,8 +57,6 @@ Apply these scripts once per database (not run by the application), in this orde
|
|||
5c. `db/role-co.sql` - new role CO with the same rights as GTO: role row (NTP schema) + copy of every GTO row in GRAINS_SCREEN_PERMISSIONS (safe to re-run)
|
||||
7. `db/grains-jobs.sql` - tables of the scheduled jobs (`GRAINS_JOBS`, `GRAINS_JOB_RUNS`), primary schema. Without it the scheduler stays idle. Jobs are then started, stopped and timed on the SU screen "المهام المجدولة" (`/jobs`); nothing runs until a job is started there. `Jobs:SchedulerEnabled=false` (set in appsettings.Development.json) switches the scheduler loop off for a process
|
||||
6. `db/gnac-finance-screens.sql` - GNAC gets claims, fines, wages, invoices and the invoice check report (safe to re-run)
|
||||
8. `db/refinery-permissions.sql` - refinery (المصفاة) modules: REFINERY_MGR gets the 6 screens and every action key (47 rows); SU needs none (safe to re-run). The external services are OFF until configured: `Refinery__Dinarak__Enabled/BaseUrl/UserName/Password` (trip payment) and `Refinery__Jopetrol__Enabled/Url/UserName/Password` (wage claim ترحيل); `Refinery__Trips__MaxPaymentAmount` (default 500, unverified)
|
||||
9. `db/refinery-op-permissions.sql` - role REFINERY_OP (موظف عطاء الصرف): the الارساليات screen, the شحن الديزل (Excel) report, print and the payment actions (13 keys); part 1 (role row, NTP schema) is only needed where the row is missing, part 2 (primary schema) writes the rows (safe to re-run). Everything else of the refinery module stays with REFINERY_MGR and SU
|
||||
|
||||
**Switching a feature off for everybody:** a row with `ROLECODE = 'DISABLED'` takes that resource out of the system for all users, SU
|
||||
included: the menu entry and buttons disappear and the API answers 403. It overrides every other row. Delete the row to bring the
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
# Refinery migration: shared brief for the porting agents
|
||||
|
||||
Port refinery modules of the legacy ColdFusion app **AqabaTCS** (`C:\inetpub\wwwroot\AqabaTCS_LIVE`, read-only) into NTP V2
|
||||
(.NET 10 API + Oracle 11g/Dapper + React/MUI web). Read first: `CLAUDE.md`, `docs/MIGRATION.md`, `docs/refinery-db-objects.txt`
|
||||
(text of the legacy DB views and the diesel / amount functions, already extracted), and `docs/schema/NAFITHTCS.md` sections
|
||||
`REFINERY_*`. Reference slices that show the house style: `src/NTP.Application/Grains/Registry`, `.../Orders` (BillingService),
|
||||
`src/NTP.Infrastructure/Persistence/Repositories/Grains/*`, `src/NTP.Api/Controllers/V1/Grains/RegistryController.cs`,
|
||||
`web/src/features/grains-registry` (pages, meta, strings, api hooks).
|
||||
|
||||
## Legacy layout (AqabaTCS)
|
||||
- Backend per entity: `backend/entities/<entity>/` : `*dao.cfc` (SQL), `*factory.cfc` (business rules, validation, transactions, log rows),
|
||||
`*factoryweb.cfc` (web layer: filter whitelist, role specific branches, row actions), `*bean.cfc` (fields).
|
||||
- Frontend per entity: `frontend/entities/<ENTITY>/<ENTITY>GRID`, `<ENTITY>` (form), `<ENTITY>Log` (history popup): `.js` + `.html`.
|
||||
- Menu / authority: `customtags/Menu.cfm` (entries REFINERYTRIP, REFINERY_WAGE_CLAIM, REFINERY_COMMISSION_CLAIM, REFINERY_WALLET,
|
||||
REFINERY_VARIABLES, REFINERY_CARDS). Grids read DB views (`REFINERY_*_VIEW`, text in docs/refinery-db-objects.txt); `common.getGridData`
|
||||
builds the filter SQL (look at `backend/common/common.cfc` when you need to know how a filter field maps to a column).
|
||||
- Captions (Arabic UI / message texts) are in the database: `select code, ar from ntp.lt_caption where code like 'REFINERY%'` (also
|
||||
`PUBLIC.%`, `ERROR.%`, `MESSAGE.%`, `MENU.%` for the codes you meet). **User-facing texts must be the legacy Arabic captions, verbatim.**
|
||||
|
||||
## Read-only database access (NAFITHTCS, real data)
|
||||
`dotnet "C:\Users\samers\AppData\Local\Temp\claude\d72adf472b8502c5\42c5454f-ddae-4fd6-af13-dba201a0f7ce\scratchpad\q\out\q.dll" NAFITHTCS "select ..."`
|
||||
(only SELECT / WITH; prints `|` separated rows, max 400). Use it to check columns, status codes, sample rows, views, `user_source`,
|
||||
`user_tab_columns`, `ntp.lt_caption`. Never print or copy a connection string; never write to the database; do not run SQL scripts.
|
||||
`appsettings.Local.json` is in the MAIN checkout (`C:\inetpub\wwwroot\NTP_V2\src\NTP.Api\`), not in your worktree: you cannot run the API.
|
||||
|
||||
## Rules (see CLAUDE.md too, they apply)
|
||||
- Oracle 11.2: no OFFSET/FETCH or identity, page with ROWNUM (`OracleSql.Paginate`), sequences for ids (`SEQ_REFINERY_*` exist). Dapper with
|
||||
classes that have settable properties for results. Bind by name; do not add unused DynamicParameters. Bind numbers, no `TO_CHAR` on indexed columns.
|
||||
Reuse the legacy views where it is simplest (they exist in the database) but prefer explicit SQL when the view is slow or wrong for the screen.
|
||||
- Layers: thin controllers (`src/NTP.Api/Controllers/V1/Refinery/<Module>Controller.cs`, route `api/v{version}/refinery/<module>`, `[RequirePermission(key)]`),
|
||||
services + contracts + validators + repository interfaces in `src/NTP.Application/Refinery/<Module>/`, Dapper repositories in
|
||||
`src/NTP.Infrastructure/Persistence/Repositories/Refinery/<Module>/` (class names `*Service` / `*Repository` registered by convention against `I{Name}`).
|
||||
Primary connection `IDbSession` (NAFITHTCS) holds all REFINERY_* tables; `IUnitOfWork.ExecuteInTransactionAsync` for multi-statement writes.
|
||||
Errors: `BusinessException` (422), `ForbiddenException`, `NotFoundException`, FluentValidation (400) with the legacy Arabic text.
|
||||
- The legacy `*_LOG` tables (OLD_DATA / NEW_DATA JSON, METHOD_NAME, USER_ID, USER_IP) are written on every legacy action: keep doing it
|
||||
(same method names, same JSON content as far as you can see in the factory) and port the log popup (history list + old/new view).
|
||||
Find out what legacy puts in USER_ID / CREATED_BY (numeric NTPUSERS id vs login) and use the matching `ICurrentUser` member.
|
||||
- **Authority**: ONLY `SU` (always allowed by the code) and role `REFINERY_MGR` get access. Do not port the legacy role-specific branches
|
||||
(REFINERY_MGR, REFINERY_OP, EXCHANGE_OP, REFINERY_AC, OPOFF, hard-coded user ids ...). Instead: one screen key per module (already defined in
|
||||
`PermissionKeys.Refinery.cs`) and one **action key per legacy action** (e.g. `refinery.trips.firstAdvance`), declared in YOUR OWN partial file
|
||||
`src/NTP.Application/Access/PermissionKeys.Refinery.<Module>.cs` (`public static partial class PermissionKeys`). Every endpoint carries
|
||||
`[RequirePermission(...)]` with the right key; the web hides buttons with `useAuth().can(key)`. Do NOT add them to `PermissionDefaults`
|
||||
(rows in GRAINS_SCREEN_PERMISSIONS are the source; the lead writes `db/refinery-permissions.sql` from the key list you report).
|
||||
Where a legacy rule depended on the role only to narrow what a user sees, drop it and say so in your report.
|
||||
- **No secrets, no real side effects**: legacy code contains hard-coded credentials (e.g. the Jopetrol SOAP password). Never copy them. External
|
||||
calls go behind `IDinarakGateway` / `IJopetrolGateway` (`src/NTP.Application/Refinery/Integrations/RefineryGateways.cs`, already written; do not
|
||||
change the signatures) with options from configuration and `Enabled=false` by default; add the non-secret defaults to
|
||||
`src/NTP.Api/appsettings.json` (section `Refinery:...`) and say in your report which env vars hold the secrets. Never call a real endpoint.
|
||||
- Web (React 19, MUI 9): Arabic (RTL), logical CSS properties, metadata-driven `DataGrid` / `MetaForm` from `web/src/components`, strings `{ en, ar }`
|
||||
in the module's `strings.ts`, API hooks with React Query like `grains-registry/api.ts`. Put everything of a module under
|
||||
`web/src/features/refinery/<module>/` and export from `web/src/features/refinery/<module>/index.ts`:
|
||||
`export const routes: RouteObject[]` (absolute paths `/refinery/<module>...`) and `export const menuItems: MenuItem[]` (leaf entries only: key = the
|
||||
screen key, title, icon, path; the lead composes the group and `features/refinery/routes.tsx`). Do NOT create `features/refinery/routes.tsx`.
|
||||
- Port behaviour, not markup: same filters, same grid columns, same row actions, same validations and messages, same status flow. Do not port dead
|
||||
code (check callers / Menu.cfm). Cite legacy `file:line` in code comments where a rule is non-obvious.
|
||||
- Tests: xUnit in `tests/NTP.Tests/Refinery/` for pure logic (calculations, status rules, validators). `dotnet test tests/NTP.Tests`.
|
||||
|
||||
## Working environment
|
||||
- You work in your own git worktree. Do not touch the main checkout. Do NOT start the API or the dev server (ports are used by the lead).
|
||||
- First copy these uncommitted foundation files from the main checkout into the same relative paths in your worktree (they are identical for all agents):
|
||||
`src/NTP.Application/Access/PermissionDefaults.cs` (class made `partial`), `src/NTP.Application/Access/PermissionKeys.Refinery.cs`,
|
||||
`src/NTP.Application/Refinery/Integrations/RefineryGateways.cs` (all under `C:\inetpub\wwwroot\NTP_V2\`). Commit them with your work.
|
||||
- Web checks need node_modules: in your worktree `web/` create a junction to the main one: `cmd /c mklink /J node_modules C:\inetpub\wwwroot\NTP_V2\web\node_modules`
|
||||
(do not commit it; check `git status`). Then `cd web && npx tsc -b --noEmit`.
|
||||
- Build with `dotnet build src/NTP.Api` and test with `dotnet test tests/NTP.Tests` in your worktree. Everything must build and pass before you finish.
|
||||
- Shared files you may have to touch (re-read right before editing, make a minimal Edit, never rewrite): `src/NTP.Infrastructure/DependencyInjection.cs`
|
||||
(gateway registration), `src/NTP.Api/appsettings.json`. Touch nothing else outside your module folders.
|
||||
- Commit your work in the worktree branch (one commit, clear message, end it with the line `Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>`).
|
||||
Do not push.
|
||||
|
||||
## Report back (your final message, plain text, concise)
|
||||
1. Branch name and commit hash. 2. Files added / changed outside your module folders. 3. **Exact list of permission keys** you declared (screen + action keys).
|
||||
4. What you did NOT port or changed on purpose (and why). 5. Anything you could not verify (nothing was run against real data except read-only SELECTs).
|
||||
6. Open questions for the owner.
|
||||
|
|
@ -1,983 +0,0 @@
|
|||
=== VIEWS (user_views text, NAFITHTCS) ===
|
||||
|
||||
--- REFINERY_CARDS_VIEW
|
||||
select "ID","TN","CARD_NUMBER","BOX_NO","CURRENT_BALANCE","CREATION_DATE","CREATED_BY","UPDATE_DATE","UPDATED_BY","STATUS_CODE","LAST_TRIP_ID"
|
||||
from REFINERY_CARDS
|
||||
|
||||
|
||||
--- REFINERY_CARDS_LOG_VIEW
|
||||
select "ID","ENTITIY_ID","METHOD_NAME","BALANCE_BEFORE","BALANCE_AFTER","CREATED_BY",to_char( "CREATION_DATE",'dd/mm/yyyy HH24:MI') CREATION_DATE,"UPDATED_BY",to_char(LAST_UPDATE_DATE,'dd/mm/yyyy HH24:MI') LAST_UPDATE_DATE, "AMOUNT","PN"
|
||||
from REFINERY_CARDS_LOG
|
||||
|
||||
|
||||
--- REFINERY_COMMISSION_CLAIM_VIEW
|
||||
select "ID","COMMISSION_CLAIM_NO",to_char("COMMISSION_CLAIM_DATE",'dd/mm/yyyy') COMMISSION_CLAIM_DATE,
|
||||
to_char(trunc(COMMISSION_CLAIM_DATE) , 'yyyymmdd') as COMMISSION_CLAIM_DATE_STRING,
|
||||
"STATUS_CODE" ,
|
||||
(select count(id) from refinery_wage_claim tr where tr.COMMISSION_claim_id = REFINERY_COMMISSION_CLAIM.id) trip_cnt
|
||||
from REFINERY_COMMISSION_CLAIM
|
||||
|
||||
|
||||
--- REFINERY_COMMISSION_LOG_VIEW
|
||||
select n.login,t."ID",t."ENTITIY_ID",t."METHOD_NAME",to_char(t."LOG_DATE",'dd/mm/yyyy HH24:MI') LOG_DATE,t."USER_ID",t."USER_IP",t."OLD_DATA",t."NEW_DATA" from refinery_commission_claim_log t
|
||||
join ntp.ntpusers n ON
|
||||
t.user_id = n.id(+)
|
||||
order by t.id desc
|
||||
|
||||
|
||||
--- REFINERY_TRIPS_VIEW
|
||||
select REFINERY_TRIPS."ID",
|
||||
"SECOND_ADVANCE_PAYMENT",
|
||||
"FIRST_ADVANCE_PAYMENT",
|
||||
"PN",REFINERY_TRIPS."STATUS_CODE",
|
||||
to_char("DISPATCH_DATE",'dd/mm/yyyy') DISPATCH_DATE,
|
||||
to_char("ACTUAL_LOADING_DATE",'dd/mm/yyyy') ACTUAL_LOADING_DATE,
|
||||
DateToString("ACTUAL_LOADING_DATE") ACTUAL_LOADING_DATE_STRING,
|
||||
DATETOSTRING(RECEIVED_DATE) RECEIVED_DATE_STRING,
|
||||
ACTUAL_LOADING_DATE LOADING_DATE,
|
||||
"ACTUAL_LOADING_TIME",
|
||||
Datetostring("DISCHARGE_ENTRY_DATE") DISCHARGE_ENTRY_DATE_STRING,
|
||||
"LOADING_CENTER","CLIENT_NO",comp.display_name CLIENT_NAME,
|
||||
REFINERY_TRIPS."TN","TRN",REFINERY_TRIPS."NNPN","MATERIAL_NO",
|
||||
"MENAGATE_NO","EMPTY_WEIGHT",
|
||||
"GROSS_WEIGHT","NET_LOADING_WEIGHT",
|
||||
"STANDARD_UNITS_WEIGHT","LITERS_WEIGHT",
|
||||
"DENSITY","TEMPERATURE","FLAG",
|
||||
"DISCHARGE_AUTHORIZTION_NO",
|
||||
"DISCHARGE_AUTHORIZTION_YEAR",
|
||||
"DISCHARGE_ENTRY_TIME",
|
||||
"DISCHARGE_EXIT_DATE",
|
||||
"DISCHARGE_EXIT_TIME",
|
||||
"ACTUAL_GROSS_WEIGHT",
|
||||
"ACTUAL_EMPTY_WEIGHT",
|
||||
"NET_DISCHARGE_WEIGHT",
|
||||
"NET_WAGE" ,REFINERY_TRIPS.DIESEL_CHARGE,
|
||||
wa.epayment,
|
||||
|
||||
decode(paid_wallet.wallet_number,null,wa.wallet_number,paid_wallet.wallet_number) wallet_number,
|
||||
decode(paid_wallet.company_code,null,wa.company_code,paid_wallet.company_code) company_code,
|
||||
decode(paid_wallet.owner_nnpn,null,wa.owner_nnpn,paid_wallet.owner_nnpn) owner_nnpn,
|
||||
decode(paid_wallet.owner_name,null,wa.owner_name,paid_wallet.owner_name) owner_name,
|
||||
decode(paid_wallet.owner_name_english,null,wa.owner_name_english,paid_wallet.owner_name_english) owner_name_english,
|
||||
decode(paid_wallet.iban,null,wa.iban,paid_wallet.iban) iban,
|
||||
decode(paid_wallet.bank_account,null,wa.bank_account,paid_wallet.bank_account) bank_account,
|
||||
decode(paid_wallet.bank_name,null,wa.bank_name,paid_wallet.bank_name) bank_name,
|
||||
|
||||
decode(wa.id,null,'0','1') as HAVE_PAYMENT_METHOD,
|
||||
drvr_wallet.wallet_number driver_wallet_number,
|
||||
decode(REFINERY_TRIPS.WAGE_CLAIM_ID ,null,'0','1') as HAS_WAGE_CLAIM,
|
||||
RECEIVED_BY,RECEIVED_DATE,PAYMENTED_BY,PAYMENTED_DATE,
|
||||
REFINERY_TRIPS.Payment_Options,
|
||||
REFINERY_TRIPS.VOUCHER_SERIAL_NUMBER,
|
||||
|
||||
--Datetostring("PAYMENTED_DATE") ,
|
||||
|
||||
--decode(REFINERY_TRIPS.Status_Code,'EXCHANGED',Datetostring(REFINERY_TRIPS.PAYMENTED_DATE),'READY_TO_PAY',Datetostring(REFINERY_TRIPS.Received_Date),
|
||||
--'DISCHARGED',Datetostring(REFINERY_TRIPS.ACTUAL_LOADING_DATE)) PAYMENTED_DATE_STRING,
|
||||
|
||||
Datetostring(REFINERY_TRIPS.ACTUAL_LOADING_DATE) PAYMENTED_DATE_STRING,
|
||||
|
||||
DISCHARGE_ENTRY_DATE,to_char("DISCHARGE_ENTRY_DATE",'dd/mm/yyyy') DISCHARGE_ENTRY_DATE_DISPLAY,
|
||||
to_char("PAYMENTED_DATE",'dd/mm/yyyy') PAYMENTED_DATE_DISPLAY,
|
||||
"WATER_AMOUNT","SEDIMENT_AMOUNT",REFINERY_TRIPS."TRIP_STATUS",REFINERY_TRIPS."USER_ID",REFINERY_TRIPS."LAST_UPDATE_DATE","DAY_TIME","PROGRAM_ID","WORK_STN_ID","EXCHANGE_CLAIM_NO","PAID_AMOUNT_WATER",
|
||||
WAGE_CLAIM_ID,
|
||||
rwc.wage_claim_no,
|
||||
info.name_ar DRVR,
|
||||
REVERSE_PAYMENT,
|
||||
S.FIRSTNAME RECEIVED_BY_NAME,
|
||||
LT.AR STATUS_CODE_AR,remarks,
|
||||
REFINERY_TRIPS.Loading_No,
|
||||
(NET_LOADING_WEIGHT - net_discharge_weight) as "WEIGHT_DIIERANCE",
|
||||
CARD.CARD_NUMBER,CARD.CURRENT_BALANCE,
|
||||
decode(wa.epayment,null,unistr('\0644\0627\0020\064A\0648\062C\062F'),'0',unistr('\062D\0648\0627\0644\0629'),'1',unistr('\0627\0644\0643\062A\0631\0648\0646\064A')) as PAYMENT_METHOD,
|
||||
--decode(wa.epayment,null,0,'0',1,'1',2) as PAYMENT_METHOD_CODE,
|
||||
decode(REFINERY_TRIPS.PAYMENT_OPTIONS,NULL,decode(wa.epayment,null,0,'0',1,'1',2),'CACH_PAYMENT',3) as PAYMENT_METHOD_CODE,
|
||||
Datetostring("PAYMENTED_DATE") PAYMENTED_DATE_STRING_SEARCH,
|
||||
|
||||
REFINERY_TRIPS.DINARAK_REFERENCE_ID , REFINERY_WALLET_ID ,
|
||||
(CASE WHEN WATER_AMOUNT > 0 THEN 1
|
||||
ELSE 0 END) as WATER_EXIST,
|
||||
|
||||
decode(paid_wallet.epayment,null,'','0',unistr('\062D\0648\0627\0644\0629'),'1',unistr('\0627\0644\0643\062A\0631\0648\0646\064A')) as paid_epayment
|
||||
,"TRIP_NET_WAGE" , "REMAINING_BALANCE" ,penalty_amount , penalty_quantity
|
||||
|
||||
from REFINERY_TRIPS,ntp.lt_caption lt,refinery_wage_claim rwc,drivers_info info,refinery_company comp,REFINERY_WALLET wa,NTP.NTPUSERS S,REFINERY_WALLET drvr_wallet,
|
||||
REFINERY_CARDS CARD,REFINERY_WALLET paid_wallet
|
||||
where LT.CODE(+) = 'REFINERYTRIP.STATUS.'|| REFINERY_TRIPS.STATUS_CODE
|
||||
and rwc.id(+)=REFINERY_TRIPS.Wage_Claim_Id
|
||||
and wa.tn(+)=REFINERY_TRIPS.tn
|
||||
and info.nnpn(+)=REFINERY_TRIPS.Nnpn
|
||||
and info.status_code(+) = 'COMPLETED'
|
||||
and comp.code(+) = CLIENT_NO
|
||||
AND s.id(+)=REFINERY_TRIPS.Received_By
|
||||
and to_char(drvr_wallet.driver_nnpn(+))=REFINERY_TRIPS.Nnpn
|
||||
and CARD.TN(+) = REFINERY_TRIPS.tn
|
||||
AND card.Status_Code(+) = 'ACTIVE'
|
||||
and wa.status_code(+) = 'ACTIVE'
|
||||
and drvr_wallet.Status_Code(+)='ACTIVE'
|
||||
and paid_wallet.id(+)=REFINERY_TRIPS.Refinery_Wallet_Id
|
||||
|
||||
|
||||
--- REFINERY_TRIPS_LOG_VIEW
|
||||
select n.login,t."ID",t."ENTITIY_ID",t."METHOD_NAME",to_char(t."LOG_DATE",'dd/mm/yyyy HH24:MI') LOG_DATE,t."USER_ID",t."USER_IP",t."OLD_DATA",t."NEW_DATA" from refinery_trips_LOG t
|
||||
join ntp.ntpusers n ON
|
||||
t.user_id = n.id(+)
|
||||
order by t.id desc
|
||||
|
||||
|
||||
--- REFINERY_VARIABLES_VIEW
|
||||
select rownum ID,GROUP_ID ,to_char("START_DATE",'yyyy-mm-dd') "START_DATE" , Datetostring("START_DATE") START_DATE_STRING, to_char("END_DATE",'yyyy-mm-dd') "END_DATE", Datetostring("END_DATE") END_DATE_STRING,"DIESEL_LITER_PRICE","TON_WAGE","TON_PRICE","DRIVER_TIP","PERMIT_DISPATCH","WAYBILL_FEE","COMMISSION","TOLERANCE_PERCENTAGE","FIRST_ADVANCE_PAYMENT" /*, TON_PRICE_CORRECTION */ from (
|
||||
select start_date,end_date,key_name,key_value ,GROUP_ID from REFINERY_VARIABLES where KEY_NAME != 'AUTDIT_MODE'
|
||||
)
|
||||
pivot
|
||||
(
|
||||
sum(key_value)
|
||||
for key_name in ('DIESEL_LITER_PRICE' DIESEL_LITER_PRICE,'TON_WAGE' TON_WAGE,'TON_PRICE' TON_PRICE,'DRIVER_TIP' DRIVER_TIP,'PERMIT_DISPATCH' PERMIT_DISPATCH,'WAYBILL_FEE' WAYBILL_FEE,'COMMISSION' COMMISSION,'TOLERANCE_PERCENTAGE' TOLERANCE_PERCENTAGE, 'FIRST_ADVANCE_PAYMENT' FIRST_ADVANCE_PAYMENT /* , 'TON_PRICE_CORRECTION' TON_PRICE_CORRECTION */)
|
||||
)
|
||||
order by 1
|
||||
|
||||
|
||||
--- REFINERY_WAGE_CLAIM_VIEW
|
||||
select REFINERY_WAGE_CLAIM."ID","WAGE_CLAIM_NO",to_char("WAGE_CLAIM_DATE",'dd/mm/yyyy') WAGE_CLAIM_DATE,REFINERY_WAGE_CLAIM."STATUS_CODE" ,COMMISSION_CLAIM_ID,
|
||||
decode(REFINERY_WAGE_CLAIM.COMMISSION_CLAIM_ID ,null,'0','1') as HAS_COMMISSION_CLAIM,
|
||||
(select count(id) from refinery_trips tr where tr.wage_claim_id = REFINERY_WAGE_CLAIM.id) trip_cnt,comm.commission_claim_no
|
||||
from REFINERY_WAGE_CLAIM,refinery_commission_claim comm
|
||||
where comm.id(+)=REFINERY_WAGE_CLAIM.COMMISSION_CLAIM_ID
|
||||
|
||||
|
||||
--- REFINERY_WAGE_CLAIM_LOG_VIEW
|
||||
select n.login,t."ID",t."ENTITIY_ID",t."METHOD_NAME",to_char(t."LOG_DATE",'dd/mm/yyyy HH24:MI') LOG_DATE,t."USER_ID",t."USER_IP",t."OLD_DATA",t."NEW_DATA" from refinery_wage_claim_log t
|
||||
join ntp.ntpusers n ON
|
||||
t.user_id = n.id(+)
|
||||
order by t.id desc
|
||||
|
||||
|
||||
--- REFINERY_WALLET_VIEW
|
||||
select "ID"
|
||||
,"TN"
|
||||
,"COMPANY_CODE"
|
||||
,"EPAYMENT"
|
||||
,decode("OWNER_NNPN",null,DRIVER_NNPN,OWNER_NNPN) OWNER_NNPN
|
||||
,decode("OWNER_NNPN",null,DRIVER_NNPN,OWNER_NNPN) NNPN
|
||||
,"WALLET_NUMBER"
|
||||
,decode("OWNER_NAME",null,DRIVER_NAME,OWNER_NAME) OWNER_NAME
|
||||
,"CREATION_DATE"
|
||||
,"DRIVER_NAME"
|
||||
,"DRIVER_NNPN"
|
||||
,"IBAN"
|
||||
,"BANK_ACCOUNT"
|
||||
,"BANK_NAME"
|
||||
,"CREATED_BY"
|
||||
,"UPDATE_DATE"
|
||||
,"UPDATED_BY"
|
||||
,"STATUS_CODE"
|
||||
,"BANK_BRANCH","OWNER_NAME_ENGLISH",
|
||||
----,DECODE("EPAYMENT",0,unistr('\062D\0648\0627\0644\0629'),unistr('\0645\062D\0641\0638\0629\0020\0627\0644\0643\062A\0631\0648\0646\064A\0629')) PAYMENT_METHOD,
|
||||
( CASE
|
||||
WHEN DRIVER_NNPN is not null THEN 'DRAIVER_WALLET'
|
||||
WHEN EPAYMENT = 0 THEN 'BANK'
|
||||
|
||||
ELSE 'EWALLET'
|
||||
END ) PAYMENT_METHOD
|
||||
from REFINERY_WALLET
|
||||
|
||||
|
||||
--- REFINERY_WALLET_LOG_VIEW
|
||||
select n.login,t."ID",t."ENTITIY_ID",t."METHOD_NAME",to_char(t."LOG_DATE",'dd/mm/yyyy HH24:MI') LOG_DATE,t."USER_ID",t."USER_IP",t."OLD_DATA",t."NEW_DATA" from refinery_WALLET_LOG t
|
||||
join ntp.ntpusers n ON
|
||||
t.user_id = n.id(+)
|
||||
order by t.id desc
|
||||
|
||||
|
||||
--- REFINERY_DIESEL_REPORT_VIEW
|
||||
select T.ID, t.pn,t.tn,T.STATUS_CODE,
|
||||
t.discharge_authoriztion_no,c.creation_date,
|
||||
s.firstname,
|
||||
t.DIESEL_CHARGE,
|
||||
|
||||
decode (c.method_name,'FIRST_ADVANCED_PAYMENT',unistr('\0634\062D\0646\0020\0644\0644\062A\062D\0645\064A\0644'),'SECOND_ADVANCED_PAYMENT',unistr('\0634\062D\0646\0020\0644\0644\062A\0641\0631\064A\063A'),'SECOND_ADVANCED_PAYMENT_REVERSE',unistr('\0627\0644\063A\0627\0621\0020\0634\062D\0646\0020\0627\0644\062A\0641\0631\064A\063A'),'FIRST_ADVANCED_PAYMENT_REVERSE',unistr('\0627\0644\063A\0627\0621\0020\0634\062D\0646\0020\0627\0644\062A\062D\0645\064A\0644')) method_name,
|
||||
|
||||
c.balance_before,c.balance_after,C.AMOUNT from refinery_trips_view t,refinery_cards_log c,NTP.NTPUSERS s
|
||||
|
||||
where c.PN=t.PN
|
||||
and s.id(+)=to_number(c.created_by)
|
||||
|
||||
ORDER BY CREATION_DATE
|
||||
|
||||
|
||||
--- REFINERY_CLAIMS_REPORT_VIEW
|
||||
select t."ID",t.WAGE_CLAIM_ID, t.STATUS_CODE,TRIP_STATUS, "DISCHARGE_AUTHORIZTION_NO",discharge_authoriztion_year, to_char(Discharge_Entry_Date , 'dd/mm/yyyy' ) Discharge_Entry_Date, client_no, '' client_NAME,'' serial,loading_no , to_char(actual_loading_date , 'dd/mm/yyyy') actual_loading_date , NET_LOADING_WEIGHT,WATER_AMOUNT , NET_DISCHARGE_WEIGHT
|
||||
,(NET_LOADING_WEIGHT - net_discharge_weight) as "WEIGHT_DIIERANCE",
|
||||
TON_WAGE ,CALCULATED_QUANTITY_TON ,QUANTITY_WAGE ,w.wage_claim_no, TOLERANCE_QUANTITY ,
|
||||
(CASE
|
||||
WHEN Water_amount > 0 THEN
|
||||
'YES'
|
||||
ELSE 'NO'
|
||||
END) WATER_EXIST,
|
||||
|
||||
|
||||
CASE
|
||||
WHEN (NET_LOADING_WEIGHT - net_discharge_weight) < TOLERANCE_QUANTITY THEN
|
||||
ltrim(to_char(0, '0.000'))
|
||||
ELSE ltrim(to_char(PENALTY_QUANTITY, '9999999.999'))
|
||||
END PENALTY_QUANTITY,
|
||||
|
||||
--ltrim(to_char(PENALTY_QUANTITY, '9999999.999')) PENALTY_QUANTITY ,
|
||||
ltrim(to_char(TON_PRICE, '9999999.999')) TON_PRICE ,
|
||||
PENALTY_AMOUNT,
|
||||
ltrim(to_char(DRIVER_TIP, '9999999.999')) DRIVER_TIP ,
|
||||
ltrim(to_char(PERMIT_DISPATCH, '9999999.999')) PERMIT_DISPATCH ,
|
||||
WAYBILL_FEE,DIESEL_LITER_PRICE,
|
||||
ltrim(to_char((select sum(amount) from REFINERY_CARDS_LOG where pn = t.pn),'9999999.99')) advance_payment_FOR_DIESEL,
|
||||
ltrim(to_char(COMMISSION, '9999999.999')) COMMISSION ,
|
||||
ltrim(to_char(NET_WAGE, '9999999.999')) NET_WAGE,T.TN,info.name_ar DRVR
|
||||
|
||||
from REFINERY_TRIPS t,refinery_wage_claim w,DRIVERS_INFO info
|
||||
|
||||
where w.id=t.wage_claim_id
|
||||
and info.nnpn(+)=t.Nnpn
|
||||
and info.status_code(+) = 'COMPLETED'
|
||||
|
||||
|
||||
--- REFINERY_CLAIMS_REPORT
|
||||
select "ID",STATUS_CODE,TRIP_STATUS, "DISCHARGE_AUTHORIZTION_NO",discharge_authoriztion_year, Discharge_Entry_Date, client_no, '' client_NAME,'' serial,loading_no , actual_loading_date, NET_LOADING_WEIGHT,Water_amount , net_discharge_weight ,(NET_LOADING_WEIGHT - net_discharge_weight) as "WEIGHT_DIIERANCE",
|
||||
TON_WAGE ,CALCULATED_QUANTITY_TON ,QUANTITY_WAGE , TOLERANCE_QUANTITY ,
|
||||
(CASE
|
||||
WHEN Water_amount > 0 THEN
|
||||
'YES'
|
||||
ELSE 'NO'
|
||||
END) WATER_EXIST,
|
||||
ltrim(to_char(PENALTY_QUANTITY, '9999999.99')) PENALTY_QUANTITY ,
|
||||
ltrim(to_char(TON_PRICE, '9999999.99')) TON_PRICE ,
|
||||
PENALTY_AMOUNT,
|
||||
ltrim(to_char(DRIVER_TIP, '9999999.99')) DRIVER_TIP ,
|
||||
ltrim(to_char(PERMIT_DISPATCH, '9999999.99')) PERMIT_DISPATCH ,
|
||||
WAYBILL_FEE,DIESEL_LITER_PRICE,
|
||||
ltrim(to_char((select sum(amount) from REFINERY_CARDS_LOG where pn = REFINERY_TRIPS.pn),'9999999.99')) advance_payment_FOR_DIESEL,
|
||||
COMMISSION ,NET_WAGE
|
||||
from REFINERY_TRIPS
|
||||
|
||||
|
||||
=== FUNCTIONS ===
|
||||
|
||||
--- CALCULATEREFINARYDIESEL
|
||||
FUNCTION "CALCULATEREFINARYDIESEL" (RefineryId in numeric)
|
||||
|
||||
return float as
|
||||
|
||||
|
||||
|
||||
DieslCount number;
|
||||
|
||||
LoadingDate date;
|
||||
|
||||
CURRENT_BALANCE float;
|
||||
|
||||
DIESEL_LITER_PRICE float;
|
||||
|
||||
FIRST_ADVANCE_PAYMENT float;
|
||||
|
||||
begin
|
||||
|
||||
|
||||
|
||||
select LOADING_DATE,CURRENT_BALANCE
|
||||
|
||||
into LoadingDate,CURRENT_BALANCE
|
||||
|
||||
from refinery_trips_view where id = RefineryId;
|
||||
|
||||
|
||||
|
||||
SELECT ( select DIESEL_CHARGE from REFINERY_TRIPS where ID = RefineryId)
|
||||
|
||||
into DieslCount FROM DUAL;
|
||||
|
||||
|
||||
|
||||
select key_value into FIRST_ADVANCE_PAYMENT
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'FIRST_ADVANCE_PAYMENT'
|
||||
|
||||
and sysdate between start_date and end_date +1 ;
|
||||
|
||||
|
||||
|
||||
if DieslCount = 0 then -- No First Payment
|
||||
|
||||
return FIRST_ADVANCE_PAYMENT+CURRENT_BALANCE;
|
||||
|
||||
else if DieslCount = 1 then -- No Second Payment
|
||||
|
||||
|
||||
|
||||
-- Get Liter current price
|
||||
|
||||
select key_value into DIESEL_LITER_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DIESEL_LITER_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
|
||||
|
||||
return (DIESEL_LITER_PRICE * 350)+CURRENT_BALANCE-FIRST_ADVANCE_PAYMENT;
|
||||
|
||||
else
|
||||
|
||||
return CURRENT_BALANCE;
|
||||
|
||||
end if;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
end CalculateRefinaryDiesel;
|
||||
|
||||
|
||||
--- CALCULATEREFINARYAMOUNT
|
||||
FUNCTION "CALCULATEREFINARYAMOUNT" (RefineryId in numeric)
|
||||
|
||||
return float as
|
||||
|
||||
FIRST_ADVANCE_PAYMENT float;
|
||||
|
||||
DIESEL_LITER_PRICE float;
|
||||
|
||||
TON_WAGE float;
|
||||
|
||||
TON_PRICE float;
|
||||
|
||||
DRIVER_TIP float;
|
||||
|
||||
PERMIT_DISPATCH float;
|
||||
|
||||
WAYBILL_FEE float;
|
||||
|
||||
COMMISSION float;
|
||||
|
||||
TOLERANCE_PERCENTAGE float;
|
||||
|
||||
NetLoadingWeight int;
|
||||
|
||||
NetDischargeWeight int;
|
||||
|
||||
CalculatedAmount float;
|
||||
|
||||
WaterAmount int;
|
||||
|
||||
FineQuantity float;
|
||||
|
||||
AllowQuantity float;
|
||||
|
||||
LoadingDate Date;
|
||||
|
||||
truckNumber int;
|
||||
|
||||
REMAINING_BALANCE float;
|
||||
|
||||
begin
|
||||
|
||||
select tn,net_loading_weight,
|
||||
|
||||
net_discharge_weight,
|
||||
|
||||
water_amount,
|
||||
|
||||
actual_loading_date
|
||||
|
||||
into truckNumber,NetLoadingWeight, NetDischargeWeight, WaterAmount, LoadingDate
|
||||
|
||||
from refinery_trips
|
||||
|
||||
where id = RefineryId;
|
||||
|
||||
select key_value
|
||||
|
||||
into FIRST_ADVANCE_PAYMENT
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'FIRST_ADVANCE_PAYMENT'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DIESEL_LITER_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DIESEL_LITER_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_WAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_WAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DRIVER_TIP
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DRIVER_TIP'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into PERMIT_DISPATCH
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'PERMIT_DISPATCH'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into WAYBILL_FEE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'WAYBILL_FEE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into COMMISSION
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'COMMISSION'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TOLERANCE_PERCENTAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TOLERANCE_PERCENTAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
|
||||
|
||||
AllowQuantity := FLOOR(NetLoadingWeight * TOLERANCE_PERCENTAGE);
|
||||
|
||||
|
||||
|
||||
FineQuantity := (NetLoadingWeight - NetDischargeWeight - WaterAmount);
|
||||
|
||||
|
||||
|
||||
IF FineQuantity <= AllowQuantity THEN
|
||||
|
||||
FineQuantity := 0;
|
||||
|
||||
else
|
||||
|
||||
FineQuantity := FineQuantity - AllowQuantity;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
FineQuantity := (FineQuantity / 1000) * TON_PRICE;
|
||||
|
||||
|
||||
|
||||
IF WaterAmount >= (NetLoadingWeight - NetDischargeWeight) THEN
|
||||
|
||||
CalculatedAmount := (NetLoadingWeight) / 1000;
|
||||
|
||||
ELSE
|
||||
|
||||
CalculatedAmount := (NetDischargeWeight + WaterAmount) / 1000;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
CalculatedAmount := (CalculatedAmount * TON_WAGE) - FineQuantity -
|
||||
|
||||
DRIVER_TIP - PERMIT_DISPATCH - WAYBILL_FEE -
|
||||
|
||||
(DIESEL_LITER_PRICE * 350) - COMMISSION;
|
||||
|
||||
|
||||
|
||||
--- calcualte amount after remaining balance
|
||||
|
||||
select remaining_balance
|
||||
|
||||
into REMAINING_BALANCE
|
||||
|
||||
from REFINERY_REMAINING_BALANCE
|
||||
|
||||
where tn = truckNumber ;
|
||||
|
||||
CalculatedAmount := CalculatedAmount +REMAINING_BALANCE;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return ROUND(CalculatedAmount, 3);
|
||||
|
||||
|
||||
|
||||
end CalculateRefinaryAmount;
|
||||
|
||||
|
||||
--- CALCULATEREFINARYAMOUNT6
|
||||
FUNCTION "CALCULATEREFINARYAMOUNT6" (RefineryId in numeric)
|
||||
|
||||
return float as
|
||||
|
||||
FIRST_ADVANCE_PAYMENT float;
|
||||
|
||||
DIESEL_LITER_PRICE float;
|
||||
|
||||
TON_WAGE float;
|
||||
|
||||
TON_PRICE float;
|
||||
|
||||
DRIVER_TIP float;
|
||||
|
||||
PERMIT_DISPATCH float;
|
||||
|
||||
WAYBILL_FEE float;
|
||||
|
||||
COMMISSION float;
|
||||
|
||||
TOLERANCE_PERCENTAGE float;
|
||||
|
||||
NetLoadingWeight int;
|
||||
|
||||
NetDischargeWeight int;
|
||||
|
||||
CalculatedAmount float;
|
||||
|
||||
WaterAmount int;
|
||||
|
||||
FineQuantity float;
|
||||
|
||||
AllowQuantity float;
|
||||
|
||||
LoadingDate Date;
|
||||
|
||||
truckNumber int;
|
||||
|
||||
REMAINING_BALANCE float;
|
||||
|
||||
begin
|
||||
|
||||
select tn,net_loading_weight,
|
||||
|
||||
net_discharge_weight,
|
||||
|
||||
water_amount,
|
||||
|
||||
actual_loading_date
|
||||
|
||||
into truckNumber,NetLoadingWeight, NetDischargeWeight, WaterAmount, LoadingDate
|
||||
|
||||
from refinery_trips
|
||||
|
||||
where id = RefineryId;
|
||||
|
||||
select key_value
|
||||
|
||||
into FIRST_ADVANCE_PAYMENT
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'FIRST_ADVANCE_PAYMENT'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DIESEL_LITER_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DIESEL_LITER_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_WAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_WAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DRIVER_TIP
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DRIVER_TIP'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into PERMIT_DISPATCH
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'PERMIT_DISPATCH'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into WAYBILL_FEE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'WAYBILL_FEE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into COMMISSION
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'COMMISSION'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TOLERANCE_PERCENTAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TOLERANCE_PERCENTAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
|
||||
|
||||
AllowQuantity := FLOOR(NetLoadingWeight * TOLERANCE_PERCENTAGE);
|
||||
|
||||
|
||||
|
||||
FineQuantity := (NetLoadingWeight - NetDischargeWeight - WaterAmount);
|
||||
|
||||
|
||||
|
||||
IF FineQuantity <= AllowQuantity THEN
|
||||
|
||||
FineQuantity := 0;
|
||||
|
||||
else
|
||||
|
||||
FineQuantity := FineQuantity - AllowQuantity;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
FineQuantity := (FineQuantity / 1000) * TON_PRICE;
|
||||
|
||||
|
||||
|
||||
IF WaterAmount >= (NetLoadingWeight - NetDischargeWeight) THEN
|
||||
|
||||
CalculatedAmount := (NetLoadingWeight) / 1000;
|
||||
|
||||
ELSE
|
||||
|
||||
CalculatedAmount := (NetDischargeWeight + WaterAmount) / 1000;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
CalculatedAmount := (CalculatedAmount * TON_WAGE) - FineQuantity -
|
||||
|
||||
DRIVER_TIP - PERMIT_DISPATCH - WAYBILL_FEE -
|
||||
|
||||
(DIESEL_LITER_PRICE * 350) - COMMISSION;
|
||||
|
||||
|
||||
|
||||
--- calcualte amount after remaining balance
|
||||
|
||||
select remaining_balance
|
||||
|
||||
into REMAINING_BALANCE
|
||||
|
||||
from REFINERY_REMAINING_BALANCE
|
||||
|
||||
where tn = truckNumber ;
|
||||
|
||||
CalculatedAmount := CalculatedAmount +REMAINING_BALANCE;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
return ROUND(CalculatedAmount, 3);
|
||||
|
||||
|
||||
|
||||
end CalculateRefinaryAmount6;
|
||||
|
||||
|
||||
--- CALCULATEREFINARYAMOUNTREPORT
|
||||
FUNCTION "CALCULATEREFINARYAMOUNTREPORT" (RefineryId in numeric,calType in numeric)
|
||||
|
||||
return float as
|
||||
|
||||
FIRST_ADVANCE_PAYMENT float;
|
||||
|
||||
DIESEL_LITER_PRICE float;
|
||||
|
||||
TON_WAGE float;
|
||||
|
||||
TON_PRICE float;
|
||||
|
||||
DRIVER_TIP float;
|
||||
|
||||
PERMIT_DISPATCH float;
|
||||
|
||||
WAYBILL_FEE float;
|
||||
|
||||
COMMISSION float;
|
||||
|
||||
TOLERANCE_PERCENTAGE float;
|
||||
|
||||
NetLoadingWeight int;
|
||||
|
||||
NetDischargeWeight int;
|
||||
|
||||
CalculatedAmount float;
|
||||
|
||||
WaterAmount int;
|
||||
|
||||
FineQuantity float;
|
||||
|
||||
AllowQuantity float;
|
||||
|
||||
LoadingDate Date;
|
||||
|
||||
begin
|
||||
|
||||
|
||||
|
||||
select net_loading_weight,
|
||||
|
||||
net_discharge_weight,
|
||||
|
||||
water_amount,
|
||||
|
||||
actual_loading_date
|
||||
|
||||
into NetLoadingWeight, NetDischargeWeight, WaterAmount, LoadingDate
|
||||
|
||||
from refinery_trips
|
||||
|
||||
where id = RefineryId;
|
||||
|
||||
select key_value
|
||||
|
||||
into FIRST_ADVANCE_PAYMENT
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'FIRST_ADVANCE_PAYMENT'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DIESEL_LITER_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DIESEL_LITER_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_WAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_WAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TON_PRICE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TON_PRICE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into DRIVER_TIP
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'DRIVER_TIP'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into PERMIT_DISPATCH
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'PERMIT_DISPATCH'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into WAYBILL_FEE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'WAYBILL_FEE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into COMMISSION
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'COMMISSION'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
select key_value
|
||||
|
||||
into TOLERANCE_PERCENTAGE
|
||||
|
||||
from refinery_variables
|
||||
|
||||
where KEY_NAME = 'TOLERANCE_PERCENTAGE'
|
||||
|
||||
and LoadingDate between start_date and end_date;
|
||||
|
||||
|
||||
|
||||
AllowQuantity := FLOOR(NetLoadingWeight * TOLERANCE_PERCENTAGE);
|
||||
|
||||
|
||||
|
||||
FineQuantity := (NetLoadingWeight - NetDischargeWeight - WaterAmount);
|
||||
|
||||
|
||||
|
||||
IF FineQuantity <= AllowQuantity THEN
|
||||
|
||||
FineQuantity := 0;
|
||||
|
||||
else
|
||||
|
||||
FineQuantity := FineQuantity - AllowQuantity;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
FineQuantity := (FineQuantity / 1000) * TON_PRICE;
|
||||
|
||||
|
||||
|
||||
IF WaterAmount >= (NetLoadingWeight - NetDischargeWeight) THEN
|
||||
|
||||
CalculatedAmount := (NetLoadingWeight) / 1000;
|
||||
|
||||
ELSE
|
||||
|
||||
CalculatedAmount := (NetDischargeWeight + WaterAmount) / 1000;
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
if calType = 0 then
|
||||
|
||||
CalculatedAmount := (CalculatedAmount * TON_WAGE) - FineQuantity -
|
||||
|
||||
DRIVER_TIP - PERMIT_DISPATCH - WAYBILL_FEE -
|
||||
|
||||
(DIESEL_LITER_PRICE * 350) - COMMISSION;
|
||||
|
||||
|
||||
|
||||
return ROUND(CalculatedAmount, 4);
|
||||
|
||||
|
||||
|
||||
else
|
||||
|
||||
|
||||
|
||||
return ROUND(CalculatedAmount*TON_WAGE, 4);
|
||||
|
||||
end if;
|
||||
|
||||
|
||||
|
||||
end CalculateRefinaryAmountReport;
|
||||
|
||||
|
|
@ -234,12 +234,12 @@ public sealed class OrderReportsController(IOrderReportService reports) : Contro
|
|||
public Task<TenderOrderReportDto> TenderOrders([FromQuery] DateTime orderDate, CancellationToken ct) =>
|
||||
reports.GetTenderOrderReportAsync(orderDate, ct);
|
||||
|
||||
/// Legacy Excel (HTML table) of the distribution ratios.
|
||||
/// format: csv (default) or xlsx.
|
||||
[HttpGet("tender-orders/export")]
|
||||
[RequirePermission(PermissionKeys.OrdersReportOrders)]
|
||||
public async Task<IActionResult> ExportTenderOrders([FromQuery] DateTime orderDate, CancellationToken ct = default)
|
||||
public async Task<IActionResult> ExportTenderOrders([FromQuery] DateTime orderDate, [FromQuery] string format = "csv", CancellationToken ct = default)
|
||||
{
|
||||
var f = await reports.ExportTenderOrderReportAsync(orderDate, ct);
|
||||
var f = await reports.ExportTenderOrderReportAsync(orderDate, format, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@ public sealed class RegistryController(
|
|||
IRegistryOpsService ops,
|
||||
IRegistryLookupService lookups,
|
||||
IRegistryAttachmentService attachments,
|
||||
IRegistryQueuePermitService queuePermits,
|
||||
IRegistryExportService exports) : ControllerBase
|
||||
IRegistryQueuePermitService queuePermits) : ControllerBase
|
||||
{
|
||||
// ------------------------------------------------------------------------------------------ permissions + lookups
|
||||
|
||||
|
|
@ -68,33 +67,6 @@ public sealed class RegistryController(
|
|||
[FromQuery] string? headType, [FromQuery] long? tcscac, [FromQuery] int page = 1, [FromQuery] int pageSize = 15, CancellationToken ct = default) =>
|
||||
trucks.SearchAsync(new TruckListQuery(searchType, tn, chasesNumber, statusCode, headType, tcscac), new PageRequest(page, pageSize), ct);
|
||||
|
||||
/// <summary>Excel of the filtered truck / trailer list (legacy openTruckReportExcel; right from GRAINS_SCREEN_PERMISSIONS).</summary>
|
||||
[HttpGet("trucks/export")]
|
||||
[RequirePermission(PermissionKeys.RegistryTrucksExport)]
|
||||
public async Task<IActionResult> ExportTrucks([FromQuery] string? searchType, [FromQuery] string? tn, [FromQuery] string? chasesNumber, [FromQuery] string? statusCode,
|
||||
[FromQuery] string? headType, [FromQuery] long? tcscac, CancellationToken ct)
|
||||
{
|
||||
var f = await exports.ExportTrucksAsync(new TruckListQuery(searchType, tn, chasesNumber, statusCode, headType, tcscac), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("trailers/export")]
|
||||
[RequirePermission(PermissionKeys.RegistryTrailersExport)]
|
||||
public async Task<IActionResult> ExportTrailers([FromQuery] string? tn, [FromQuery] string? chasesNumber, [FromQuery] string? statusCode, [FromQuery] long? tcscac, CancellationToken ct)
|
||||
{
|
||||
var f = await exports.ExportTrailersAsync(new TrailerListQuery(tn, chasesNumber, statusCode, tcscac), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
/// <summary>Excel of the filtered driver list (legacy openDriversReportExcel; right from GRAINS_SCREEN_PERMISSIONS).</summary>
|
||||
[HttpGet("drivers/export")]
|
||||
[RequirePermission(PermissionKeys.RegistryDriversExport)]
|
||||
public async Task<IActionResult> ExportDrivers([FromQuery] string? nnpn, [FromQuery] string? name, [FromQuery] string? statusCode, CancellationToken ct)
|
||||
{
|
||||
var f = await exports.ExportDriversAsync(new DriverListQuery(nnpn, name, statusCode), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
/// <summary>getTruckInfo (+ connected trailer, destinations, attachments).</summary>
|
||||
[HttpGet("trucks/{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RegistryTrucks)]
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Cards;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>Refinery diesel cards (بطاقات الديزل): port of refinery_cards*.cfc. Access by permission keys only (SU / REFINERY_MGR).</summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/cards")]
|
||||
[Produces("application/json")]
|
||||
public sealed class CardsController(ICardsService cards) : ControllerBase
|
||||
{
|
||||
private static IReadOnlyList<string> Split(string? statusCode) =>
|
||||
(statusCode ?? string.Empty).Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||
|
||||
/// <summary>search: filters tn and cardNumber (exact), statusCode (one or several, comma separated).</summary>
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryCards)]
|
||||
public Task<PagedResult<CardRow>> Search([FromQuery] string? tn, [FromQuery] string? cardNumber, [FromQuery] string? statusCode,
|
||||
[FromQuery] int page = 1, [FromQuery] int pageSize = 16, CancellationToken ct = default) =>
|
||||
cards.SearchAsync(new CardsQuery(tn, cardNumber, Split(statusCode)), new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("export")]
|
||||
[RequirePermission(PermissionKeys.RefineryCardsReport)]
|
||||
public async Task<IActionResult> Export([FromQuery] string? tn, [FromQuery] string? cardNumber, [FromQuery] string? statusCode, CancellationToken ct)
|
||||
{
|
||||
var f = await cards.ExportAsync(new CardsQuery(tn, cardNumber, Split(statusCode)), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryCards)]
|
||||
public Task<CardRow> Get(long id, CancellationToken ct) => cards.GetAsync(id, ct);
|
||||
|
||||
/// <summary>log: movements of the card (create, activate, deactivate, diesel top-ups of the trips).</summary>
|
||||
[HttpGet("{id:long}/log")]
|
||||
[RequirePermission(PermissionKeys.RefineryCards)]
|
||||
public Task<PagedResult<CardLogRow>> Log(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 5, CancellationToken ct = default) =>
|
||||
cards.GetLogAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission(PermissionKeys.RefineryCardsCreate)]
|
||||
public Task<CardsResult> Create([FromBody] CreateCardRequest request, CancellationToken ct) => cards.CreateAsync(request, ct);
|
||||
|
||||
[HttpPost("{id:long}/activate")]
|
||||
[RequirePermission(PermissionKeys.RefineryCardsActivate)]
|
||||
public Task<CardsResult> Activate(long id, CancellationToken ct) => cards.ActivateAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/deactivate")]
|
||||
[RequirePermission(PermissionKeys.RefineryCardsDeactivate)]
|
||||
public Task<CardsResult> Deactivate(long id, CancellationToken ct) => cards.DeactivateAsync(id, ct);
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.CommissionClaims;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>
|
||||
/// Refinery commission claims (مطالبة العمولة): port of backend\entities\refinery_commission_claim. Thin controller; the rules are in
|
||||
/// <see cref="ICommissionClaimService"/>. Search / view / log need the screen key, every action its own key.
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/commission-claims")]
|
||||
[Produces("application/json")]
|
||||
public sealed class CommissionClaimsController(ICommissionClaimService claims) : ControllerBase
|
||||
{
|
||||
private string? Ip => HttpContext.Connection.RemoteIpAddress?.ToString();
|
||||
|
||||
/// <summary>The grid: COMMISSION_CLAIM_NO, COMMISSION_CLAIM_DATE, STATUS_CODE (comma list).</summary>
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaims)]
|
||||
public Task<PagedResult<CommissionClaimRowDto>> Search(
|
||||
[FromQuery] string? commissionClaimNo, [FromQuery] DateOnly? commissionClaimDate, [FromQuery] string? statusCode,
|
||||
[FromQuery] int page = 1, [FromQuery] int pageSize = 10, CancellationToken ct = default) =>
|
||||
claims.SearchAsync(new CommissionClaimQuery(commissionClaimNo, commissionClaimDate, Split(statusCode)), new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaims)]
|
||||
public Task<CommissionClaimRowDto> Get(long id, CancellationToken ct) => claims.GetAsync(id, ct);
|
||||
|
||||
/// <summary>The wage claims grouped by the commission claim.</summary>
|
||||
[HttpGet("{id:long}/wage-claims")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaims)]
|
||||
public Task<IReadOnlyList<WageClaimRowDto>> WageClaims(long id, CancellationToken ct) => claims.WageClaimsAsync(id, ct);
|
||||
|
||||
/// <summary>Create dialog: wage claims without a commission claim (statusCode NEW and / or CLOSE, default both).</summary>
|
||||
[HttpGet("wage-claim-candidates")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaimsCreate)]
|
||||
public Task<IReadOnlyList<WageClaimRowDto>> Candidates([FromQuery] string? statusCode, CancellationToken ct) =>
|
||||
claims.CandidateWageClaimsAsync(Split(statusCode), ct);
|
||||
|
||||
[HttpGet("{id:long}/log")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaims)]
|
||||
public Task<PagedResult<ClaimLogRowDto>> Log(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 5, CancellationToken ct = default) =>
|
||||
claims.LogAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaimsCreate)]
|
||||
public Task<ClaimResult> Create(CreateCommissionClaimRequest request, CancellationToken ct) => claims.CreateAsync(request, Ip, ct);
|
||||
|
||||
/// <summary>CLAIM_COMPLETE.</summary>
|
||||
[HttpPost("{id:long}/complete")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaimsComplete)]
|
||||
public Task<ClaimResult> Complete(long id, CancellationToken ct) => claims.CompleteAsync(id, Ip, ct);
|
||||
|
||||
/// <summary>REPORT: the monthly commission invoice as an Excel file.</summary>
|
||||
[HttpGet("{id:long}/report")]
|
||||
[RequirePermission(PermissionKeys.RefineryCommissionClaimsReport)]
|
||||
public async Task<IActionResult> Report(long id, CancellationToken ct)
|
||||
{
|
||||
var f = await claims.ReportAsync(id, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
private static IReadOnlyList<string> Split(string? s) =>
|
||||
(s ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||
}
|
||||
|
|
@ -1,180 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>
|
||||
/// Refinery trips (legacy REFINERYTRIP: refinerytripfactoryweb.cfc, REFINERYTRIPGRID / REFINERYTRIP / REFINERYTRIPLOG screens).
|
||||
/// Each action has its own permission key (PermissionKeys.Refinery.Trips.cs); the list, the form and the history use the screen key.
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/trips")]
|
||||
[Produces("application/json")]
|
||||
public sealed class TripsController(
|
||||
ITripQueryService queries,
|
||||
ITripActionService actions,
|
||||
ITripReportService reports,
|
||||
IRemainingBalanceService balances) : ControllerBase
|
||||
{
|
||||
// ---- list, form, history
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryTrips)]
|
||||
public Task<PagedResult<TripGridDto>> Search([FromQuery] TripQuery query, [FromQuery] int page = 1, [FromQuery] int pageSize = 20, CancellationToken ct = default) =>
|
||||
queries.SearchAsync(query, new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("{id:long}")]
|
||||
[ProducesResponseType<TripDetailDto>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status404NotFound)]
|
||||
[RequirePermission(PermissionKeys.RefineryTrips)]
|
||||
public Task<TripDetailDto> Get(long id, CancellationToken ct) => queries.GetAsync(id, ct);
|
||||
|
||||
[HttpGet("{id:long}/log")]
|
||||
[RequirePermission(PermissionKeys.RefineryTrips)]
|
||||
public Task<PagedResult<TripLogDto>> Log(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 10, CancellationToken ct = default) =>
|
||||
queries.LogAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
// ---- diesel card advances
|
||||
[HttpPost("{id:long}/first-advance")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsFirstAdvance)]
|
||||
public Task<TripsResult> FirstAdvance(long id, CancellationToken ct) => actions.FirstAdvanceAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/second-advance")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsSecondAdvance)]
|
||||
public Task<TripsResult> SecondAdvance(long id, CancellationToken ct) => actions.SecondAdvanceAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/first-advance-reverse")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsFirstAdvanceReverse)]
|
||||
public Task<TripsResult> FirstAdvanceReverse(long id, CancellationToken ct) => actions.FirstAdvanceReverseAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/second-advance-reverse")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsSecondAdvanceReverse)]
|
||||
public Task<TripsResult> SecondAdvanceReverse(long id, CancellationToken ct) => actions.SecondAdvanceReverseAsync(id, ct);
|
||||
|
||||
// ---- wage payment
|
||||
/// <summary>صرف: e-wallet payment through Dinarak.</summary>
|
||||
[HttpPost("{id:long}/exchange")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsExchange)]
|
||||
public Task<TripsResult> Exchange(long id, CancellationToken ct) => actions.ExchangeAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/exchange-audit")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsExchangeAudit)]
|
||||
public Task<TripsResult> ExchangeAudit(long id, CancellationToken ct) => actions.ExchangeAuditAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/receipt")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsReceipt)]
|
||||
public Task<TripsResult> Receipt(long id, CancellationToken ct) => actions.ReceiptAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/payment")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsPayment)]
|
||||
public Task<TripsResult> Payment(long id, CancellationToken ct) => actions.PaymentAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/activate-wallet-exchange")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsActivateWalletExchange)]
|
||||
public Task<TripsResult> ActivateWalletExchange(long id, CancellationToken ct) => actions.ActivateWalletExchangeAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/orange-payment")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsOrangePayment)]
|
||||
public Task<TripsResult> OrangePayment(long id, CancellationToken ct) => actions.OrangePaymentAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/cash-payment")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsCashPayment)]
|
||||
public Task<TripsResult> CashPayment(long id, CancellationToken ct) => actions.CashPaymentAsync(id, ct);
|
||||
|
||||
[HttpPost("{id:long}/confirm-exchange")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsConfirmExchange)]
|
||||
public Task<TripsResult> ConfirmExchange(long id, CancellationToken ct) => actions.ConfirmExchangeAsync(id, ct);
|
||||
|
||||
/// <summary>Cash voucher (سند صرف نقدي): stores the serial on the first call, logs PRINT; the page prints the returned data.</summary>
|
||||
[HttpPost("{id:long}/print")]
|
||||
[ProducesResponseType<TripVoucherDto>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsPrint)]
|
||||
public Task<TripVoucherDto> Print(long id, CancellationToken ct) => actions.PrintAsync(id, ct);
|
||||
|
||||
// ---- remaining balance of the trucks (used by the variables screen after a ton-price correction)
|
||||
[HttpPost("remaining-balance/recalculate")]
|
||||
[ProducesResponseType<TripsResult>(StatusCodes.Status200OK)]
|
||||
[ProducesResponseType<ProblemDetails>(StatusCodes.Status422UnprocessableEntity)]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsRecalculateBalance)]
|
||||
public Task<TripsResult> RecalculateBalance(RecalculateBalanceRequest request, CancellationToken ct) =>
|
||||
balances.RecalculateForPeriodAsync(request.StartDate, request.EndDate, request.VariableGroupId, ct);
|
||||
|
||||
// ---- reports (xlsx)
|
||||
[HttpGet("reports/trips")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsReport)]
|
||||
public async Task<IActionResult> TripsReport([FromQuery] TripQuery query, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.TripsAsync(query, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("reports/operator")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsOperatorReport)]
|
||||
public async Task<IActionResult> OperatorReport([FromQuery] TripQuery query, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.OperatorAsync(query, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("reports/exchange")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsExchangeReport)]
|
||||
public async Task<IActionResult> ExchangeReport([FromQuery] TripQuery query, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.ExchangeAsync(query, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("reports/diesel")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsDieselReport)]
|
||||
public async Task<IActionResult> DieselReport([FromQuery] DieselReportQuery query, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.DieselAsync(query, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("reports/cards")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsCardsReport)]
|
||||
public async Task<IActionResult> CardsReport([FromQuery] string? tn, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.CardsAsync(tn, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("reports/bank")]
|
||||
[RequirePermission(PermissionKeys.RefineryTripsBankReport)]
|
||||
public async Task<IActionResult> BankReport([FromQuery] BankReportQuery query, CancellationToken ct)
|
||||
{
|
||||
var f = await reports.BankAsync(query, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Variables;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>
|
||||
/// Refinery pricing periods (تسعير عطاء النفط الخام): port of refinery_variables*.cfc. Thin controller; access is by permission keys only
|
||||
/// (SU / REFINERY_MGR through GRAINS_SCREEN_PERMISSIONS), the legacy REFINERY_MGR / REFINERY_AC role branches are not ported.
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/variables")]
|
||||
[Produces("application/json")]
|
||||
public sealed class VariablesController(IVariablesService variables) : ControllerBase
|
||||
{
|
||||
/// <summary>search: periods newest first. Filters: startDate (+ endDate = range of start dates) or endDate alone.</summary>
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryVariables)]
|
||||
public Task<PagedResult<VariablesSetRow>> Search([FromQuery] DateOnly? startDate, [FromQuery] DateOnly? endDate,
|
||||
[FromQuery] int page = 1, [FromQuery] int pageSize = 16, CancellationToken ct = default) =>
|
||||
variables.SearchAsync(new VariablesQuery(startDate, endDate), new PageRequest(page, pageSize), ct);
|
||||
|
||||
/// <summary>Excel of the periods grid (legacy REFINERY_VARIABLES_report).</summary>
|
||||
[HttpGet("export")]
|
||||
[RequirePermission(PermissionKeys.RefineryVariablesReport)]
|
||||
public async Task<IActionResult> Export([FromQuery] DateOnly? startDate, [FromQuery] DateOnly? endDate, CancellationToken ct)
|
||||
{
|
||||
var f = await variables.ExportAsync(new VariablesQuery(startDate, endDate), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
/// <summary>refineryRemainingBalanceReport: previous balances per truck.</summary>
|
||||
[HttpGet("remaining-balance/export")]
|
||||
[RequirePermission(PermissionKeys.RefineryVariablesRemainingBalanceReport)]
|
||||
public async Task<IActionResult> ExportRemainingBalance(CancellationToken ct)
|
||||
{
|
||||
var f = await variables.ExportRemainingBalanceAsync(ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
/// <summary>getrefinery_variables: one period (by group id) and what may still be done with it.</summary>
|
||||
[HttpGet("{groupId:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryVariables)]
|
||||
public Task<VariablesSetDetail> Get(long groupId, CancellationToken ct) => variables.GetAsync(groupId, ct);
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission(PermissionKeys.RefineryVariablesCreate)]
|
||||
public Task<VariablesResult> Create([FromBody] SaveVariablesRequest request, CancellationToken ct) => variables.CreateAsync(request, ct);
|
||||
|
||||
[HttpPut("{groupId:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryVariablesUpdate)]
|
||||
public Task<VariablesResult> Update(long groupId, [FromBody] SaveVariablesRequest request, CancellationToken ct) =>
|
||||
variables.UpdateAsync(groupId, request, ct);
|
||||
|
||||
/// <summary>UPDATE_TON_PRICE_CORRECTION (once per period).</summary>
|
||||
[HttpPost("{groupId:long}/ton-price-correction")]
|
||||
[RequirePermission(PermissionKeys.RefineryVariablesTonPriceCorrection)]
|
||||
public Task<VariablesResult> TonPriceCorrection(long groupId, [FromBody] TonPriceCorrectionRequest request, CancellationToken ct) =>
|
||||
variables.SetTonPriceCorrectionAsync(groupId, request, ct);
|
||||
}
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>
|
||||
/// Refinery wage claims (مطالبة الأجور): port of backend\entities\refinery_wage_claim (factory / factoryweb). Thin controller; the rules are in
|
||||
/// <see cref="IWageClaimService"/>. Search / view / log need the screen key, every action its own key (see PermissionKeys.Refinery.WageClaims.cs).
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/wage-claims")]
|
||||
[Produces("application/json")]
|
||||
public sealed class WageClaimsController(IWageClaimService claims) : ControllerBase
|
||||
{
|
||||
private string? Ip => HttpContext.Connection.RemoteIpAddress?.ToString();
|
||||
|
||||
/// <summary>The grid: WAGE_CLAIM_NO, WAGE_CLAIM_DATE, STATUS_CODE (comma list), COMMISSION_CLAIM_NO, HAS_COMMISSION_CLAIM (0 / 1).</summary>
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaims)]
|
||||
public Task<PagedResult<WageClaimRowDto>> Search(
|
||||
[FromQuery] string? wageClaimNo, [FromQuery] DateOnly? wageClaimDate, [FromQuery] string? statusCode, [FromQuery] string? commissionClaimNo,
|
||||
[FromQuery] string? hasCommissionClaim, [FromQuery] int page = 1, [FromQuery] int pageSize = 10, CancellationToken ct = default) =>
|
||||
claims.SearchAsync(new WageClaimQuery(
|
||||
wageClaimNo, wageClaimDate, Split(statusCode), commissionClaimNo,
|
||||
string.IsNullOrWhiteSpace(hasCommissionClaim) ? null : hasCommissionClaim.Trim() is "1" or "true"),
|
||||
new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaims)]
|
||||
public Task<WageClaimRowDto> Get(long id, CancellationToken ct) => claims.GetAsync(id, ct);
|
||||
|
||||
/// <summary>The trips attached to the claim (legacy REFINERYTRIP.searchClaimTrips with WAGE_CLAIM_ID).</summary>
|
||||
[HttpGet("{id:long}/trips")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaims)]
|
||||
public Task<PagedResult<ClaimTripRowDto>> Trips(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 10, CancellationToken ct = default) =>
|
||||
claims.TripsAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
/// <summary>Preview of the create dialog: trips of the statuses (default: all three) without a wage claim, optionally in a loading date range.</summary>
|
||||
[HttpGet("candidate-trips")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaimsCreate)]
|
||||
public Task<PagedResult<ClaimTripRowDto>> CandidateTrips(
|
||||
[FromQuery] string? statusCode, [FromQuery] DateOnly? loadingDateFrom, [FromQuery] DateOnly? loadingDateTo,
|
||||
[FromQuery] int page = 1, [FromQuery] int pageSize = 10, CancellationToken ct = default) =>
|
||||
claims.CandidateTripsAsync(Split(statusCode), loadingDateFrom, loadingDateTo, new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("{id:long}/log")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaims)]
|
||||
public Task<PagedResult<ClaimLogRowDto>> Log(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 5, CancellationToken ct = default) =>
|
||||
claims.LogAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
/// <summary>create: attaches the trips of the statuses and loading dates that have no wage claim to a new claim.</summary>
|
||||
[HttpPost]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaimsCreate)]
|
||||
public Task<ClaimResult> Create(CreateWageClaimRequest request, CancellationToken ct) => claims.CreateAsync(request, Ip, ct);
|
||||
|
||||
/// <summary>CLAIM_CLOSE (تسديد).</summary>
|
||||
[HttpPost("{id:long}/close")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaimsClose)]
|
||||
public Task<ClaimResult> Close(long id, CancellationToken ct) => claims.CloseAsync(id, Ip, ct);
|
||||
|
||||
/// <summary>TRANSFER (ترحيل): sends the claim to Jopetrol; refused with a message when the integration is disabled.</summary>
|
||||
[HttpPost("{id:long}/transfer")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaimsTransfer)]
|
||||
public Task<ClaimResult> Transfer(long id, CancellationToken ct) => claims.TransferAsync(id, Ip, ct);
|
||||
|
||||
/// <summary>REPORT: Excel of the trips of the claim.</summary>
|
||||
[HttpGet("{id:long}/export")]
|
||||
[RequirePermission(PermissionKeys.RefineryWageClaimsReport)]
|
||||
public async Task<IActionResult> Export(long id, CancellationToken ct)
|
||||
{
|
||||
var f = await claims.ExportAsync(id, ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
private static IReadOnlyList<string> Split(string? s) =>
|
||||
(s ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
using Asp.Versioning;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NTP.Api.Authorization;
|
||||
using NTP.Application.Access;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Wallets;
|
||||
|
||||
namespace NTP.Api.Controllers.V1.Refinery;
|
||||
|
||||
/// <summary>Refinery payment methods (شاشة طرق الدفع): port of refinery_wallet*.cfc. Access by permission keys only (SU / REFINERY_MGR). The Dinarak API is not called.</summary>
|
||||
[ApiController]
|
||||
[ApiVersion(1.0)]
|
||||
[Route("api/v{version:apiVersion}/refinery/wallets")]
|
||||
[Produces("application/json")]
|
||||
public sealed class WalletsController(IWalletsService wallets) : ControllerBase
|
||||
{
|
||||
private string? Ip => HttpContext.Connection.RemoteIpAddress?.ToString();
|
||||
|
||||
private static WalletsQuery Q(string? tn, string? walletNumber, string? ownerName, string? bankAccount, string? paymentMethod, string? statusCode, string? nnpn) =>
|
||||
new(tn, walletNumber, ownerName, bankAccount, paymentMethod, statusCode, nnpn);
|
||||
|
||||
/// <summary>search. paymentMethod: BANK, EWALLET or DRAIVER_WALLET; ownerName is a contains match.</summary>
|
||||
[HttpGet]
|
||||
[RequirePermission(PermissionKeys.RefineryWallets)]
|
||||
public Task<PagedResult<WalletRow>> Search([FromQuery] string? tn, [FromQuery] string? walletNumber, [FromQuery] string? ownerName,
|
||||
[FromQuery] string? bankAccount, [FromQuery] string? paymentMethod, [FromQuery] string? statusCode, [FromQuery] string? nnpn,
|
||||
[FromQuery] int page = 1, [FromQuery] int pageSize = 16, CancellationToken ct = default) =>
|
||||
wallets.SearchAsync(Q(tn, walletNumber, ownerName, bankAccount, paymentMethod, statusCode, nnpn), new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpGet("export")]
|
||||
[RequirePermission(PermissionKeys.RefineryWalletsReport)]
|
||||
public async Task<IActionResult> Export([FromQuery] string? tn, [FromQuery] string? walletNumber, [FromQuery] string? ownerName,
|
||||
[FromQuery] string? bankAccount, [FromQuery] string? paymentMethod, [FromQuery] string? statusCode, [FromQuery] string? nnpn, CancellationToken ct)
|
||||
{
|
||||
var f = await wallets.ExportAsync(Q(tn, walletNumber, ownerName, bankAccount, paymentMethod, statusCode, nnpn), ct);
|
||||
return File(f.Content, f.ContentType, f.FileName);
|
||||
}
|
||||
|
||||
[HttpGet("{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryWallets)]
|
||||
public Task<WalletDetail> Get(long id, CancellationToken ct) => wallets.GetAsync(id, ct);
|
||||
|
||||
[HttpGet("{id:long}/log")]
|
||||
[RequirePermission(PermissionKeys.RefineryWallets)]
|
||||
public Task<PagedResult<WalletLogRow>> Log(long id, [FromQuery] int page = 1, [FromQuery] int pageSize = 5, CancellationToken ct = default) =>
|
||||
wallets.GetLogAsync(id, new PageRequest(page, pageSize), ct);
|
||||
|
||||
[HttpPost]
|
||||
[RequirePermission(PermissionKeys.RefineryWalletsCreate)]
|
||||
public Task<WalletsResult> Create([FromBody] SaveWalletRequest request, CancellationToken ct) => wallets.CreateAsync(request, Ip, ct);
|
||||
|
||||
/// <summary>Deactivates the record and creates a new ACTIVE one with the new data; the answer carries the NEW id.</summary>
|
||||
[HttpPut("{id:long}")]
|
||||
[RequirePermission(PermissionKeys.RefineryWalletsUpdate)]
|
||||
public Task<WalletsResult> Update(long id, [FromBody] SaveWalletRequest request, CancellationToken ct) => wallets.UpdateAsync(id, request, Ip, ct);
|
||||
|
||||
[HttpPost("{id:long}/activate")]
|
||||
[RequirePermission(PermissionKeys.RefineryWalletsActivate)]
|
||||
public Task<WalletsResult> Activate(long id, CancellationToken ct) => wallets.ActivateAsync(id, Ip, ct);
|
||||
|
||||
[HttpPost("{id:long}/deactivate")]
|
||||
[RequirePermission(PermissionKeys.RefineryWalletsDeactivate)]
|
||||
public Task<WalletsResult> Deactivate(long id, CancellationToken ct) => wallets.DeactivateAsync(id, Ip, ct);
|
||||
}
|
||||
|
|
@ -57,7 +57,7 @@ internal sealed class GlobalExceptionHandler(
|
|||
private static (int Status, string Title, string? Detail, IDictionary<string, string[]>? Errors) Map(Exception ex) =>
|
||||
ex switch
|
||||
{
|
||||
ValidationException v when v.Errors.Any() => (400, "Validation failed", string.Join(" - ", v.Errors.Select(e => e.ErrorMessage).Distinct()),
|
||||
ValidationException v when v.Errors.Any() => (400, "Validation failed", null,
|
||||
v.Errors.GroupBy(e => e.PropertyName)
|
||||
.ToDictionary(g => g.Key, g => g.Select(e => e.ErrorMessage).ToArray())),
|
||||
ValidationException v => (400, "Validation failed", v.Message, null),
|
||||
|
|
|
|||
|
|
@ -61,17 +61,5 @@
|
|||
"ConnectionTimeoutSeconds": 15,
|
||||
"StatementCacheSize": 50,
|
||||
"CommandTimeoutSeconds": 30
|
||||
},
|
||||
|
||||
// Refinery (المصفاة). Dinarak is the e-wallet payment API used by the trip action "صرف" (legacy RefinaryDinarakApi.cfc).
|
||||
// Off here: while Enabled is false nothing is called (the action answers that the service is disabled). UserName / Password are SECRETS:
|
||||
// env vars Refinery__Dinarak__UserName / Refinery__Dinarak__Password (server .env); BaseUrl is set per environment
|
||||
// (Refinery__Dinarak__BaseUrl). MaxPaymentAmount is the largest net wage a payment action accepts (UNVERIFIED legacy value, caption says 500).
|
||||
"Refinery": {
|
||||
"Dinarak": { "Enabled": false, "BaseUrl": "", "TimeoutSeconds": 30 },
|
||||
// Jopetrol claim web service used by the wage claim "ترحيل" action: OFF, nothing is called while Enabled is false.
|
||||
// UserName / Password are secrets: env vars Refinery__Jopetrol__UserName / Refinery__Jopetrol__Password (server .env), never in a file.
|
||||
"Jopetrol": { "Enabled": false, "Url": "http://fueltrans.jopetrol.com.jo:6060/TransportPmt/TransportPaymentWS.asmx", "TimeoutSeconds": 30 },
|
||||
"Trips": { "MaxPaymentAmount": 500 }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace NTP.Application.Access;
|
|||
/// Stable resource keys the front end and the API agree on. A key is a menu entry (module/screen) or an action
|
||||
/// inside a screen. The front end uses the menu <c>key</c> of each entry (see web/src/features/*/routes.tsx).
|
||||
/// </summary>
|
||||
public static partial class PermissionKeys
|
||||
public static class PermissionKeys
|
||||
{
|
||||
// Screens (menu keys)
|
||||
public const string OrdersList = "grains.orders.list";
|
||||
|
|
@ -47,11 +47,6 @@ public static partial class PermissionKeys
|
|||
public const string RegistryTrucksEdit = "grains.registry.trucks.edit";
|
||||
public const string RegistryTrailersEdit = "grains.registry.trailers.edit";
|
||||
|
||||
// Actions: Excel export of the trucks / trailers / drivers lists. Granted ONLY by rows in GRAINS_SCREEN_PERMISSIONS (SU always).
|
||||
public const string RegistryTrucksExport = "grains.registry.trucks.export";
|
||||
public const string RegistryTrailersExport = "grains.registry.trailers.export";
|
||||
public const string RegistryDriversExport = "grains.registry.drivers.export";
|
||||
|
||||
// Actions / sub-screens of the permits module that have no menu entry of their own
|
||||
public const string PermitsClose = "grains.permits.close"; // legacy arrivalTruck.cfm
|
||||
public const string PermitsTruckOrder = "grains.permits.truckOrder"; // legacy processOpenPermit.cfm
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>Refinery diesel cards (بطاقات الديزل) action keys. The screen itself (search / view / log) is <see cref="RefineryCards"/>.</summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
/// <summary>Legacy CREATE (REFINERY_CARDS_CREATE): define a card.</summary>
|
||||
public const string RefineryCardsCreate = "refinery.cards.create";
|
||||
/// <summary>Legacy CHSTAT INACTIVE -> ACTIVE (REFINERY_CARDS_ACTIVE).</summary>
|
||||
public const string RefineryCardsActivate = "refinery.cards.activate";
|
||||
/// <summary>Legacy CHSTAT ACTIVE -> INACTIVE (REFINERY_CARDS_DEACTIVE).</summary>
|
||||
public const string RefineryCardsDeactivate = "refinery.cards.deactivate";
|
||||
/// <summary>Excel of the cards grid (legacy REFINERY_CARDS_report).</summary>
|
||||
public const string RefineryCardsReport = "refinery.cards.report";
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>
|
||||
/// Action keys of the refinery commission claims screen (مطالبة العمولة), object REFINERY_COMMISSION_CLAIM of STATUS_ACTION_MATRIX;
|
||||
/// search / view / log use the screen key <see cref="RefineryCommissionClaims"/>.
|
||||
/// </summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
public const string RefineryCommissionClaimsCreate = "refinery.commissionClaims.create"; // CREATE
|
||||
public const string RefineryCommissionClaimsComplete = "refinery.commissionClaims.complete"; // CLAIM_CLOSE / CLAIM_COMPLETE
|
||||
public const string RefineryCommissionClaimsReport = "refinery.commissionClaims.report"; // REPORT (invoice)
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>
|
||||
/// Action keys of the refinery trips screen (legacy REFINERYTRIP actions). The screen key itself is
|
||||
/// <see cref="RefineryTrips"/> (list, view, log). Granted only by GRAINS_SCREEN_PERMISSIONS rows (SU always, REFINERY_MGR by script).
|
||||
/// </summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
public const string RefineryTripsFirstAdvance = "refinery.trips.firstAdvance"; // FIRST_ADVANCED_PAYMENT
|
||||
public const string RefineryTripsSecondAdvance = "refinery.trips.secondAdvance"; // SECOND_ADVANCED_PAYMENT
|
||||
public const string RefineryTripsFirstAdvanceReverse = "refinery.trips.firstAdvanceReverse"; // FIRST_ADVANCED_PAYMENT_REVERSE
|
||||
public const string RefineryTripsSecondAdvanceReverse = "refinery.trips.secondAdvanceReverse"; // SECOND_ADVANCED_PAYMENT_REVERSE
|
||||
public const string RefineryTripsExchange = "refinery.trips.exchange"; // EXCHANGE (e-wallet through Dinarak)
|
||||
public const string RefineryTripsExchangeAudit = "refinery.trips.exchangeAudit"; // EXCHANGE_AUDIT
|
||||
public const string RefineryTripsReceipt = "refinery.trips.receipt"; // RECEIPT
|
||||
public const string RefineryTripsPayment = "refinery.trips.payment"; // PAYMENT (bank transfer)
|
||||
public const string RefineryTripsActivateWalletExchange = "refinery.trips.activateWalletExchange"; // ACTIVATE_WALLET_EXCHANGE
|
||||
public const string RefineryTripsOrangePayment = "refinery.trips.orangePayment"; // ORANGE_PAYMENT
|
||||
public const string RefineryTripsCashPayment = "refinery.trips.cashPayment"; // CACH_PAYMENT
|
||||
public const string RefineryTripsConfirmExchange = "refinery.trips.confirmExchange"; // CONFIRM_EXCHANGE
|
||||
public const string RefineryTripsPrint = "refinery.trips.print"; // print (cash voucher)
|
||||
public const string RefineryTripsReport = "refinery.trips.report"; // report (trips excel)
|
||||
public const string RefineryTripsOperatorReport = "refinery.trips.operatorReport"; // report(), REFINERY_OP column set
|
||||
public const string RefineryTripsExchangeReport = "refinery.trips.exchangeReport"; // report(), EXCHANGE_OP column set
|
||||
public const string RefineryTripsDieselReport = "refinery.trips.dieselReport"; // REFINERY_DIESEL_REPORT_VIEW report
|
||||
public const string RefineryTripsCardsReport = "refinery.trips.cardsReport"; // refineryCardsReport
|
||||
public const string RefineryTripsBankReport = "refinery.trips.bankReport"; // refineryBankReport
|
||||
public const string RefineryTripsRecalculateBalance = "refinery.trips.recalculateBalance"; // calculateRemainigBalance
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>Refinery variables (تسعير عطاء النفط الخام) action keys. The screen itself (search / view) is <see cref="RefineryVariables"/>.</summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
/// <summary>Legacy STATUS_ACTION_MATRIX CREATE (REFINERY_VARIABLES_CREATE): new pricing period.</summary>
|
||||
public const string RefineryVariablesCreate = "refinery.variables.create";
|
||||
/// <summary>Legacy UPDATE: edit a pricing period (only while no trip was loaded inside it).</summary>
|
||||
public const string RefineryVariablesUpdate = "refinery.variables.update";
|
||||
/// <summary>Legacy UPDATE_TON_PRICE_CORRECTION: set the actual ton price once.</summary>
|
||||
public const string RefineryVariablesTonPriceCorrection = "refinery.variables.tonPriceCorrection";
|
||||
/// <summary>Excel of the pricing periods grid (legacy REFINERY_VARIABLES_report).</summary>
|
||||
public const string RefineryVariablesReport = "refinery.variables.report";
|
||||
/// <summary>Excel of the previous balances per truck (legacy refineryRemainingBalanceReport).</summary>
|
||||
public const string RefineryVariablesRemainingBalanceReport = "refinery.variables.remainingBalanceReport";
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>
|
||||
/// Action keys of the refinery wage claims screen (مطالبة الأجور). One key per legacy action of STATUS_ACTION_MATRIX
|
||||
/// (object REFINERY_WAGE_CLAIM); search / view / log use the screen key <see cref="RefineryWageClaims"/>.
|
||||
/// </summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
public const string RefineryWageClaimsCreate = "refinery.wageClaims.create"; // CREATE
|
||||
public const string RefineryWageClaimsClose = "refinery.wageClaims.close"; // CLAIM_CLOSE (تسديد)
|
||||
public const string RefineryWageClaimsTransfer = "refinery.wageClaims.transfer"; // TRANSFER (ترحيل)
|
||||
public const string RefineryWageClaimsReport = "refinery.wageClaims.report"; // REPORT (excel of the trips of a claim)
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>Refinery payment methods (شاشة طرق الدفع: e-wallet, bank transfer, driver tip wallet) action keys. The screen itself is <see cref="RefineryWallets"/>.</summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
/// <summary>Legacy CREATE (REFINERY_WALLET_CREATE).</summary>
|
||||
public const string RefineryWalletsCreate = "refinery.wallets.create";
|
||||
/// <summary>Legacy UPDATE (REFINERY_WALLET_update): ACTIVE records only; the old record is deactivated and a new one created.</summary>
|
||||
public const string RefineryWalletsUpdate = "refinery.wallets.update";
|
||||
/// <summary>Legacy CHSTAT INACTIVE -> ACTIVE (REFINERY_WALLET_ACTIVATE).</summary>
|
||||
public const string RefineryWalletsActivate = "refinery.wallets.activate";
|
||||
/// <summary>Legacy DEACTIVATE (REFINERY_WALLET_DEACTIVATE).</summary>
|
||||
public const string RefineryWalletsDeactivate = "refinery.wallets.deactivate";
|
||||
/// <summary>Legacy REPORT (REFINERY_WALLET_report): Excel of the filtered grid.</summary>
|
||||
public const string RefineryWalletsReport = "refinery.wallets.report";
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
namespace NTP.Application.Access;
|
||||
|
||||
/// <summary>
|
||||
/// Refinery (المصفاة) module keys, ported from the AqabaTCS app. Granted ONLY by rows in GRAINS_SCREEN_PERMISSIONS (see
|
||||
/// db/refinery-permissions.sql: SU is always allowed, REFINERY_MGR gets every key); none of them is in <see cref="PermissionDefaults"/>.
|
||||
/// Action keys of one module live in that module's own partial file (PermissionKeys.Refinery.<Module>.cs).
|
||||
/// </summary>
|
||||
public static partial class PermissionKeys
|
||||
{
|
||||
// Screens (menu keys), one per legacy menu entry (customtags/Menu.cfm)
|
||||
public const string RefineryTrips = "refinery.trips"; // REFINERYTRIPGRID
|
||||
public const string RefineryWageClaims = "refinery.wageClaims"; // REFINERY_WAGE_CLAIMGRID
|
||||
public const string RefineryCommissionClaims = "refinery.commissionClaims"; // REFINERY_COMMISSION_CLAIMGRID
|
||||
public const string RefineryWallets = "refinery.wallets"; // REFINERY_WALLETGRID
|
||||
public const string RefineryVariables = "refinery.variables"; // REFINERY_VARIABLESGRID
|
||||
public const string RefineryCards = "refinery.cards"; // REFINERY_CARDSGRID
|
||||
}
|
||||
|
|
@ -15,9 +15,9 @@ public sealed class ChangePasswordRequestValidator : AbstractValidator<ChangePas
|
|||
{
|
||||
public ChangePasswordRequestValidator()
|
||||
{
|
||||
RuleFor(x => x.OldPassword).NotEmpty().WithMessage("الرجاء إدخال كلمة السر الحالية").MaximumLength(200);
|
||||
RuleFor(x => x.OldPassword).NotEmpty().MaximumLength(200);
|
||||
// login keeps accepting every existing password; only a NEW password has to be reasonably strong
|
||||
RuleFor(x => x.NewPassword).NotEmpty().WithMessage("الرجاء إدخال كلمة السر الجديدة").MaximumLength(200)
|
||||
RuleFor(x => x.NewPassword).NotEmpty().MaximumLength(200)
|
||||
.MinimumLength(8).WithMessage("كلمة السر يجب ألا تقل عن 8 خانات")
|
||||
.Must(p => p is not null && p.Any(char.IsLetter) && p.Any(char.IsDigit)).WithMessage("كلمة السر يجب أن تحتوي على أحرف وأرقام")
|
||||
.Must((r, p) => p != r.OldPassword).WithMessage("كلمة السر الجديدة يجب أن تختلف عن القديمة");
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@ namespace NTP.Application.Grains.Orders;
|
|||
public interface IOrderReportService
|
||||
{
|
||||
Task<TenderOrderReportDto> GetTenderOrderReportAsync(DateTime orderDate, CancellationToken ct);
|
||||
/// <summary>The legacy tenderOrderReport_xls.cfm Excel (an HTML table opened by Excel).</summary>
|
||||
Task<ExportFile> ExportTenderOrderReportAsync(DateTime orderDate, CancellationToken ct);
|
||||
Task<ExportFile> ExportTenderOrderReportAsync(DateTime orderDate, string format, CancellationToken ct);
|
||||
|
||||
Task<FinancialBillingPage> GetFinancialBillingAsync(long scac, long invoiceNumber, PageRequest page, CancellationToken ct);
|
||||
/// <summary>The legacy FinancialBilling.cfm Excel (an HTML table opened by Excel), byte for byte the same layout.</summary>
|
||||
|
|
@ -63,40 +62,30 @@ public sealed class OrderReportService(IOrderReportRepository repository, ICurre
|
|||
destRows.Sum(x => x.Individuals), destRows.Sum(x => x.Companies));
|
||||
}
|
||||
|
||||
/// <summary>Legacy tenderOrderReport_xls.cfm: an HTML table opened by Excel, same layout and texts.</summary>
|
||||
public async Task<ExportFile> ExportTenderOrderReportAsync(DateTime orderDate, CancellationToken ct)
|
||||
public async Task<ExportFile> ExportTenderOrderReportAsync(DateTime orderDate, string format, CancellationToken ct)
|
||||
{
|
||||
var r = await GetTenderOrderReportAsync(orderDate, ct);
|
||||
static string E(object? v) => System.Net.WebUtility.HtmlEncode(Convert.ToString(v, System.Globalization.CultureInfo.InvariantCulture) ?? string.Empty);
|
||||
static string TypeLabel(string? t) => t switch { TenderOrderType.Individuals => "افراد", TenderOrderType.Company => "شركات", _ => string.Empty };
|
||||
string TypeLabel(string? t) => t switch
|
||||
{
|
||||
TenderOrderType.Individuals => L("افراد", "Individuals"),
|
||||
TenderOrderType.Company => L("شركات", "Companies"),
|
||||
_ => string.Empty
|
||||
};
|
||||
|
||||
var h = new System.Text.StringBuilder();
|
||||
h.Append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>");
|
||||
h.Append("<style>.header{font-weight:bold;font-size:28px;}");
|
||||
h.Append(".sub_header{font-weight:bold;font-size:14px;text-align:right;width:80px;background-color:#034878;color:#FFFFFF;text-align:center;}");
|
||||
h.Append(".footer{background-color:#034878;color:#FFFFFF;font-weight:bold;}</style>");
|
||||
h.Append("<table border=\"2\" bordercolor=\"#034878\"><tr><td><table align=\"center\" dir=\"rtl\" border=\"1\">");
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\"><td colspan=\"6\" align=\"center\" class=\"header\">شركة نافذ للخدمات اللوجستية</td></tr>");
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\"><td colspan=\"6\" align=\"center\" class=\"header\"> نسب التوزيع في طلبيات السائب</td></tr>");
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\"><td class=\"sub_header\">افراد \\ شركات</td><td class=\"sub_header\">العدد</td><td class=\"sub_header\">النسبة</td></tr>");
|
||||
foreach (var x in r.ByType)
|
||||
h.Append($"<tr align=\"center\" dir=\"rtl\"><td>{TypeLabel(x.Type)}</td><td>{E(x.Quantity)}</td><td>{E(x.Percent)}</td></tr>");
|
||||
h.Append($"<tr align=\"center\" dir=\"rtl\"><td>المجموع</td><td>{E(r.TypeTotal)}</td><td>100%</td></tr>");
|
||||
h.Append("<tr><td colspan=\"6\"></td></tr>");
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\">");
|
||||
foreach (var c in new[] { "الوجهة", "عدد الافراد", "نسبة الافراد", "عدد الشركات", "نسبة الشركات", "المجموع" })
|
||||
h.Append($"<td class=\"sub_header\">{c}</td>");
|
||||
h.Append("</tr>");
|
||||
foreach (var x in r.ByDestination)
|
||||
h.Append($"<tr align=\"center\" dir=\"rtl\"><td>{E(x.Destination)}</td><td>{E(x.Individuals)}</td><td>{E(x.IndividualsPercent)}%</td><td>{E(x.Companies)}</td><td>{E(x.CompaniesPercent)}%</td><td>{E(x.Total)}</td></tr>");
|
||||
h.Append("<tr><td colspan=\"6\"></td></tr>");
|
||||
if (r.ByDestination.Count == 0) h.Append("<tr><td colspan=\"6\">لايوجد معلومات</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"2\">بتاريخ : {DateTime.Now:dd/MM/yyyy HH:mm}</td><td colspan=\"2\">جميع الحقوق محفوظة لشركة نافذ للخدمات اللوجستية</td>");
|
||||
h.Append($"<td colspan=\"2\" align=\"left\">طبع التقرير بواسطة : {E(user.UserId)}</td></tr>");
|
||||
h.Append("</table></td></tr></table></body></html>");
|
||||
var title = new[] { L("شركة نافذ للخدمات اللوجستية", "Nafith Logistics Services"), L("نسب التوزيع في طلبيات السائب", "Distribution ratios of bulk orders"), $"{L("تاريخ الطلبية", "Order date")}: {r.OrderDate}" };
|
||||
var t1 = new ExportTable(title,
|
||||
[L("افراد \\ شركات", "Individuals / Companies"), L("العدد", "Count"), L("النسبة", "Ratio")],
|
||||
r.ByType.Select(x => (IReadOnlyList<object?>)new object?[] { TypeLabel(x.Type), x.Quantity, x.Percent }).ToList(),
|
||||
[L("المجموع", "Total"), r.TypeTotal, "100%"]);
|
||||
|
||||
var bytes = new System.Text.UTF8Encoding(true).GetPreamble().Concat(System.Text.Encoding.UTF8.GetBytes(h.ToString())).ToArray();
|
||||
return new ExportFile(bytes, "application/vnd.ms-excel", "ordersReport.xls");
|
||||
var t2 = new ExportTable([],
|
||||
[L("الوجهة", "Destination"), L("عدد الافراد", "Individuals"), L("نسبة الافراد", "Individuals %"),
|
||||
L("عدد الشركات", "Companies"), L("نسبة الشركات", "Companies %"), L("المجموع", "Total")],
|
||||
r.ByDestination.Select(x => (IReadOnlyList<object?>)new object?[]
|
||||
{ x.Destination, x.Individuals, x.IndividualsPercent + "%", x.Companies, x.CompaniesPercent + "%", x.Total }).ToList(),
|
||||
[L("المجموع", "Total"), r.TotalIndividuals, null, r.TotalCompanies, null, r.TotalIndividuals + r.TotalCompanies]);
|
||||
|
||||
return Build([t1, t2], format, $"ordersReport_{r.OrderDate}");
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ financial billing
|
||||
|
|
|
|||
|
|
@ -47,14 +47,14 @@ public sealed record TenderOrderDto(
|
|||
bool? MobileShow,
|
||||
bool CanDelete);
|
||||
|
||||
// Shift (optional): Mobile shift: 1 morning, 2 evening, 3 night (legacy form field SHIFT).
|
||||
// Shift: Mobile shift: 1 morning, 2 evening, 3 night (legacy form field SHIFT).
|
||||
// Type: AHALE or COMP (required unless cargo type is 41).
|
||||
public sealed record CreateTenderOrderRequest(
|
||||
long CargoType,
|
||||
long Location,
|
||||
long Destination,
|
||||
DateTime OrderDate,
|
||||
int? Shift,
|
||||
int Shift,
|
||||
int Quantity,
|
||||
bool IsTipper,
|
||||
string? Type);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public static class OrdersErrors
|
|||
new("BILLING_DNW_MISSING", "الوزن المستلم مطلوب");
|
||||
|
||||
public static BusinessException SentWeightRange() =>
|
||||
new("BILLING_LNW_RANGE", "يجب أن يكون الوزن بين 0 - 60000");
|
||||
new("BILLING_LNW_RANGE", "يجب أن يكون الوزن بين 0 - 50000");
|
||||
|
||||
public static BusinessException PriceNotDefined() =>
|
||||
new("BILLING_PRICE_NOT_DEFINED", "لا تسطيع الإضافة - السعر لهذه الوجهة غير معرف");
|
||||
|
|
@ -176,8 +176,8 @@ public static class BillingCalculator
|
|||
/// <summary>Page JS checkDate: discharge date must not be before load date.</summary>
|
||||
public static bool IsDischargeAfterLoad(DateTime load, DateTime discharge) => discharge.Date >= load.Date;
|
||||
|
||||
/// <summary>Page JS checkNumber: sent weight between 0 and 60000 (legacy limit was 50000).</summary>
|
||||
public static bool IsSentWeightInRange(decimal lnw) => lnw >= 0 && lnw <= 60000;
|
||||
/// <summary>Page JS checkNumber: sent weight between 0 and 50000.</summary>
|
||||
public static bool IsSentWeightInRange(decimal lnw) => lnw >= 0 && lnw <= 50000;
|
||||
}
|
||||
|
||||
public static class GrainsWeightRules
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public sealed class CreateTenderOrderValidator : AbstractValidator<CreateTenderO
|
|||
RuleFor(x => x.Location).GreaterThan(0).WithMessage("موقع التحميل مطلوب");
|
||||
RuleFor(x => x.Destination).GreaterThan(0).WithMessage("الوجهه مطلوبة");
|
||||
RuleFor(x => x.OrderDate).NotEmpty().WithMessage("تاريخ الطلبية مطلوب");
|
||||
RuleFor(x => x.Shift).InclusiveBetween(1, 3).When(x => x.Shift.HasValue).WithMessage("الفترة غير صحيحة");
|
||||
RuleFor(x => x.Shift).InclusiveBetween(1, 3).WithMessage("الفترة مطلوبة");
|
||||
RuleFor(x => x.Quantity)
|
||||
.Must(TenderOrderRules.IsQuantityValid).WithMessage("عدد السيارات يجب ان يكون بين 1 - 200");
|
||||
RuleFor(x => x.Type)
|
||||
|
|
|
|||
|
|
@ -367,8 +367,7 @@ public sealed class DistributionService(
|
|||
? await destinations.GetTruckDestinationsAsync(tn, ct)
|
||||
: company is long c ? await destinations.GetCompanyLocationsAsync(c, ct) : [];
|
||||
var names = await repo.GetLocationNamesAsync(locations, ct);
|
||||
// legacy loops the allowed ids in list order and appends " - " + name (empty when the location is unknown)
|
||||
result.CompanyLocations = string.Concat(locations.Select(id => " - " + names.FirstOrDefault(n => n.Id == id).Name));
|
||||
result.CompanyLocations = string.Concat(names.Select(n => " - " + n.Name));
|
||||
|
||||
var orders = await repo.GetActiveOrdersInWindowAsync(new ShiftWindow
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
using System.Net;
|
||||
using System.Text;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Grains.Registry;
|
||||
|
||||
public interface IRegistryExportService
|
||||
{
|
||||
Task<ExportFile> ExportTrucksAsync(TruckListQuery query, CancellationToken ct);
|
||||
Task<ExportFile> ExportTrailersAsync(TrailerListQuery query, CancellationToken ct);
|
||||
Task<ExportFile> ExportDriversAsync(DriverListQuery query, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Excel of the filtered registry grids (legacy truckGrid.cfm openTruckReportExcel / driverGrid.cfm openDriversReportExcel: the buttons
|
||||
/// were shown to GTO, GOO, GNAC / GTO, GOO). Who may export is decided only by the permission keys *.export (GRAINS_SCREEN_PERMISSIONS, see
|
||||
/// the controller); there is no role list in code.
|
||||
/// </summary>
|
||||
public sealed class RegistryExportService(
|
||||
ITruckRegistryService trucks, ITrailerRegistryService trailers, IDriverRegistryService drivers, ICurrentUser user) : IRegistryExportService
|
||||
{
|
||||
private const int MaxRows = 20000;
|
||||
private static async Task<List<T>> AllAsync<T>(Func<PageRequest, Task<PagedResult<T>>> fetch)
|
||||
{
|
||||
var all = new List<T>();
|
||||
for (var p = 1; all.Count < MaxRows; p++)
|
||||
{
|
||||
var r = await fetch(new PageRequest(p, PageRequest.MaxPageSize));
|
||||
all.AddRange(r.Items);
|
||||
if (r.Items.Count == 0 || all.Count >= r.TotalCount) break;
|
||||
}
|
||||
return all;
|
||||
}
|
||||
|
||||
public async Task<ExportFile> ExportTrucksAsync(TruckListQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = await AllAsync(p => trucks.SearchAsync(query, p, ct));
|
||||
var label = query.SearchType == "TRN" ? "المقطورة" : "القاطرة";
|
||||
return Build("شاشة القاطرات/ المقطورات المسجلة", "TruckReport",
|
||||
[label, "رقم الشاصي", "الشركة", "انتهاء الترخيص", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"],
|
||||
rows.Select(r => new object?[] { r.Tn, r.ChasesNumber, r.CompName, D(r.RegDate), D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption }));
|
||||
}
|
||||
|
||||
public async Task<ExportFile> ExportTrailersAsync(TrailerListQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = await AllAsync(p => trailers.SearchAsync(query, p, ct));
|
||||
return Build("شاشة المقطورات المسجلة", "TrailerReport",
|
||||
["رقم المقطورة", "رقم الشاصي", "الشركة", "المالك", "انتهاء الترخيص", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"],
|
||||
rows.Select(r => new object?[] { r.Tn, r.ChasesNumber, r.CompName, r.OwnerName, D(r.RegDate), D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption }));
|
||||
}
|
||||
|
||||
public async Task<ExportFile> ExportDriversAsync(DriverListQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = await AllAsync(p => drivers.SearchAsync(query, p, ct));
|
||||
return Build("شاشة السائقين المسجلين", "DriversReport",
|
||||
["الرقم الوطني", "الاسم", "رقم الرخصة", "انتهاء الرخصة", "الشركة", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"],
|
||||
rows.Select(r => new object?[] { r.Nnpn, r.Name, r.Dln, D(r.Dled), r.CompName, D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption }));
|
||||
}
|
||||
|
||||
private static string D(DateTime? d, bool time = false) => d is null ? string.Empty : d.Value.ToString(time ? "dd/MM/yyyy HH:mm" : "dd/MM/yyyy");
|
||||
|
||||
private ExportFile Build(string title, string fileName, string[] headers, IEnumerable<object?[]> rows)
|
||||
{
|
||||
static string E(object? v) => WebUtility.HtmlEncode(Convert.ToString(v, System.Globalization.CultureInfo.InvariantCulture) ?? string.Empty);
|
||||
var n = headers.Length;
|
||||
var h = new StringBuilder();
|
||||
h.Append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>");
|
||||
h.Append("<style>.header{font-weight:bold;font-size:28px;}");
|
||||
h.Append(".sub_header{font-weight:bold;font-size:14px;width:80px;background-color:#034878;color:#FFFFFF;text-align:center;}</style>");
|
||||
h.Append("<table border=\"2\" bordercolor=\"#034878\"><tr><td><table align=\"center\" dir=\"rtl\" border=\"1\">");
|
||||
h.Append($"<tr align=\"center\" dir=\"rtl\"><td colspan=\"{n}\" align=\"center\" class=\"header\">شركة نافذ للخدمات اللوجستية</td></tr>");
|
||||
h.Append($"<tr align=\"center\" dir=\"rtl\"><td colspan=\"{n}\" align=\"center\" class=\"header\">{E(title)}</td></tr>");
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\">");
|
||||
foreach (var c in headers) h.Append($"<td class=\"sub_header\">{E(c)}</td>");
|
||||
h.Append("</tr>");
|
||||
var count = 0;
|
||||
foreach (var r in rows)
|
||||
{
|
||||
count++;
|
||||
h.Append("<tr align=\"center\" dir=\"rtl\">");
|
||||
foreach (var v in r) h.Append($"<td>{E(v)}</td>");
|
||||
h.Append("</tr>");
|
||||
}
|
||||
if (count == 0) h.Append($"<tr><td colspan=\"{n}\">لايوجد معلومات</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"{n}\">بتاريخ : {DateTime.Now:dd/MM/yyyy HH:mm} - عدد النتائج : {count} - طبع التقرير بواسطة : {E(user.UserId)}</td></tr>");
|
||||
h.Append("</table></td></tr></table></body></html>");
|
||||
var bytes = new UTF8Encoding(true).GetPreamble().Concat(Encoding.UTF8.GetBytes(h.ToString())).ToArray();
|
||||
return new ExportFile(bytes, "application/vnd.ms-excel", fileName + ".xls");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Cards;
|
||||
|
||||
/// <summary>Row of REFINERY_CARDS (a Jopetrol diesel card of a truck). Class with settable properties (Dapper + Oracle NUMBER).</summary>
|
||||
public class CardRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long Tn { get; set; }
|
||||
public string? CardNumber { get; set; }
|
||||
public long? BoxNo { get; set; }
|
||||
public decimal CurrentBalance { get; set; }
|
||||
public DateTime? CreationDate { get; set; }
|
||||
public string? CreatedBy { get; set; }
|
||||
public DateTime? UpdateDate { get; set; }
|
||||
public string? UpdatedBy { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
public long? LastTripId { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Row of REFINERY_CARDS_LOG (legacy REFINERY_CARDS_LOG_VIEW). METHOD_NAME is the raw code, the screen translates it.</summary>
|
||||
public class CardLogRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long EntityId { get; set; }
|
||||
public string? MethodName { get; set; }
|
||||
public decimal BalanceBefore { get; set; }
|
||||
public decimal BalanceAfter { get; set; }
|
||||
public decimal Amount { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? UpdatedBy { get; set; }
|
||||
public DateTime? LastUpdateDate { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Grid filters (legacy TN, CARD_NUMBER exact match, STATUS_CODE multi select).</summary>
|
||||
public sealed record CardsQuery(string? Tn, string? CardNumber, IReadOnlyList<string> StatusCodes);
|
||||
|
||||
public sealed class CreateCardRequest
|
||||
{
|
||||
public long Tn { get; set; }
|
||||
public string? CardNumber { get; set; }
|
||||
public decimal CurrentBalance { get; set; }
|
||||
}
|
||||
|
||||
public sealed record CardsResult(string Message, long? Id = null);
|
||||
|
||||
public static class CardValues
|
||||
{
|
||||
public const string Active = "ACTIVE";
|
||||
public const string Inactive = "INACTIVE";
|
||||
public const string MethodCreate = "CREATE";
|
||||
public const string MethodActive = "ACTIVE";
|
||||
public const string MethodDeactive = "DEACTIVE";
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Cards;
|
||||
|
||||
/// <summary>User-facing texts (legacy captions verbatim; * = no row in LT_CAPTION, new wording).</summary>
|
||||
public static class CardsMessages
|
||||
{
|
||||
public const string CardExists = "هذه البطاقة معرفة سابقاً"; // ERROR.REINERY_CARDS_IS_EXIST
|
||||
public const string TruckHasActiveCard = "الشاحنة له بطاقة ديزل فعالة معرفة مسبقاً"; // ERROR.REINERY_CARDS_TN_HAS_ACTIVE_CARD
|
||||
public const string BalanceNotEqualPrevious = "رصيد البطاقة الجديدة غير مطابق للبطاقة السابقة"; // ERROR.CURRENT_BALANCE_IS_NOT_EQ_PERVIOS_CARD
|
||||
public const string CardNotFound = "بطاقة تعبئة الديزل غير معرفة"; // ERROR.THE_REFINERY_CARD_IS_NOT_EXIST
|
||||
public const string StatusNotAllowed = "لا يمكن تنفيذ هذا الإجراء على البطاقة في حالتها الحالية"; // * (legacy: STATUS_ACTION_MATRIX refusal)
|
||||
public const string Required = "الرجاء ادخال جميع الحقول"; // REPORT.VALIDATION
|
||||
public const string Done = "";
|
||||
}
|
||||
|
||||
public static class CardsErrors
|
||||
{
|
||||
public const string CardExists = "REINERY_CARDS_IS_EXIST";
|
||||
public const string TruckHasActiveCard = "REINERY_CARDS_TN_HAS_ACTIVE_CARD";
|
||||
public const string BalanceNotEqualPrevious = "CURRENT_BALANCE_IS_NOT_EQ_PERVIOS_CARD";
|
||||
public const string CardNotFound = "THE_REFINERY_CARD_IS_NOT_EXIST";
|
||||
public const string StatusNotAllowed = "REFINERY_CARD_STATUS_NOT_ALLOWED";
|
||||
}
|
||||
|
||||
/// <summary>Pure rules of refinery_cardsfactory.cfc.</summary>
|
||||
public static class CardsRules
|
||||
{
|
||||
/// <summary>REFINERY_CARDS.CARD_NUMBER is VARCHAR2(10).</summary>
|
||||
public const int CardNumberMaxLength = 10;
|
||||
/// <summary>The balance is also copied into REFINERY_CARDS_LOG (NUMBER(10,3)).</summary>
|
||||
public const decimal BalanceLimit = 10_000_000m;
|
||||
|
||||
/// <summary>Legacy matrix: only INACTIVE -> ACTIVE (CHSTAT, REFINERY_CARDS_ACTIVE) ...</summary>
|
||||
public static bool CanActivate(string? status) => string.Equals(status, CardValues.Inactive, StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
/// <summary>... and ACTIVE -> INACTIVE (REFINERY_CARDS_DEACTIVE). There is no other transition and no card update.</summary>
|
||||
public static bool CanDeactivate(string? status) => string.Equals(status, CardValues.Active, StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
/// <summary>
|
||||
/// refinery_cardsfactory.cfc:154-165: a truck that already had (inactive) cards may only get a new card with the balance of the
|
||||
/// previous one (the balance travels with the truck). <paramref name="previousInactiveBalance"/> = balance of its latest inactive card.
|
||||
/// </summary>
|
||||
public static bool BalanceMatchesPrevious(decimal? previousInactiveBalance, decimal newBalance) =>
|
||||
previousInactiveBalance is null || previousInactiveBalance.Value == newBalance;
|
||||
}
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
using FluentValidation;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
using NTP.Application.Grains.Reports;
|
||||
|
||||
namespace NTP.Application.Refinery.Cards;
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinery_cardsfactory.cfc / refinery_cardsfactoryweb.cfc (screen REFINERY_CARDS, بطاقات الديزل). Access is by permission keys only
|
||||
/// (legacy REFINERY_MGR / REFINERY_AC branches not ported). There is no card update: the legacy update is broken (it reads a variable that does
|
||||
/// not exist and updates variable columns) and STATUS_ACTION_MATRIX has no usable UPDATE row for cards.
|
||||
/// </summary>
|
||||
public sealed class CardsService(
|
||||
ICardsRepository repository,
|
||||
IUnitOfWork unitOfWork,
|
||||
ICurrentUser user,
|
||||
IReportExcelService excel,
|
||||
IValidator<CreateCardRequest> createValidator) : ICardsService
|
||||
{
|
||||
public Task<PagedResult<CardRow>> SearchAsync(CardsQuery query, PageRequest page, CancellationToken ct) =>
|
||||
repository.SearchAsync(query, page, ct);
|
||||
|
||||
public async Task<CardRow> GetAsync(long id, CancellationToken ct) =>
|
||||
await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery card", id);
|
||||
|
||||
public async Task<PagedResult<CardLogRow>> GetLogAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
_ = await GetAsync(id, ct);
|
||||
return await repository.GetLogAsync(id, page, ct);
|
||||
}
|
||||
|
||||
public async Task<CardsResult> CreateAsync(CreateCardRequest request, CancellationToken ct)
|
||||
{
|
||||
await createValidator.ValidateAndThrowAsync(request, ct);
|
||||
var number = request.CardNumber!.Trim();
|
||||
|
||||
if (await repository.CardNumberExistsAsync(number, ct))
|
||||
throw new BusinessException(CardsErrors.CardExists, CardsMessages.CardExists);
|
||||
|
||||
var cards = await repository.GetByTruckAsync(request.Tn, ct);
|
||||
if (cards.Any(c => string.Equals(c.StatusCode, CardValues.Active, StringComparison.OrdinalIgnoreCase)))
|
||||
throw new BusinessException(CardsErrors.TruckHasActiveCard, CardsMessages.TruckHasActiveCard);
|
||||
var previous = cards.Where(c => string.Equals(c.StatusCode, CardValues.Inactive, StringComparison.OrdinalIgnoreCase))
|
||||
.OrderByDescending(c => c.Id).FirstOrDefault();
|
||||
if (!CardsRules.BalanceMatchesPrevious(previous?.CurrentBalance, request.CurrentBalance))
|
||||
throw new BusinessException(CardsErrors.BalanceNotEqualPrevious, CardsMessages.BalanceNotEqualPrevious);
|
||||
|
||||
var id = await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
var newId = await repository.InsertAsync(request.Tn, number, request.CurrentBalance, user.UserId, token);
|
||||
// refinery_cardsfactory.cfc:176: CREATE log row, balance 0 -> opening balance
|
||||
await repository.InsertLogAsync(newId, CardValues.MethodCreate, 0, request.CurrentBalance, request.CurrentBalance, user.UserId, token);
|
||||
return newId;
|
||||
}, ct);
|
||||
return new CardsResult(CardsMessages.Done, id);
|
||||
}
|
||||
|
||||
public async Task<CardsResult> ActivateAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var card = await repository.GetAsync(id, ct) ?? throw new BusinessException(CardsErrors.CardNotFound, CardsMessages.CardNotFound);
|
||||
if (!CardsRules.CanActivate(card.StatusCode))
|
||||
throw new BusinessException(CardsErrors.StatusNotAllowed, CardsMessages.StatusNotAllowed);
|
||||
// a truck keeps one active card (refinery_cardsfactory.cfc:250)
|
||||
var cards = await repository.GetByTruckAsync(card.Tn, ct);
|
||||
if (cards.Any(c => string.Equals(c.StatusCode, CardValues.Active, StringComparison.OrdinalIgnoreCase)))
|
||||
throw new BusinessException(CardsErrors.TruckHasActiveCard, CardsMessages.TruckHasActiveCard);
|
||||
|
||||
await ChangeStatusAsync(card, CardValues.Active, CardValues.MethodActive, ct);
|
||||
return new CardsResult(CardsMessages.Done, id);
|
||||
}
|
||||
|
||||
public async Task<CardsResult> DeactivateAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var card = await repository.GetAsync(id, ct) ?? throw new BusinessException(CardsErrors.CardNotFound, CardsMessages.CardNotFound);
|
||||
if (!CardsRules.CanDeactivate(card.StatusCode))
|
||||
throw new BusinessException(CardsErrors.StatusNotAllowed, CardsMessages.StatusNotAllowed);
|
||||
|
||||
await ChangeStatusAsync(card, CardValues.Inactive, CardValues.MethodDeactive, ct);
|
||||
return new CardsResult(CardsMessages.Done, id);
|
||||
}
|
||||
|
||||
/// <summary>Status change + log row (balance before = after = the card balance, amount 0, PN '0'), like the legacy ACTIVE / DEACTIVE.</summary>
|
||||
private Task ChangeStatusAsync(CardRow card, string status, string method, CancellationToken ct) =>
|
||||
unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
await repository.ChangeStatusAsync(card.Id, status, user.UserId, token);
|
||||
await repository.InsertLogAsync(card.Id, method, card.CurrentBalance, card.CurrentBalance, 0, user.UserId, token);
|
||||
return true;
|
||||
}, ct);
|
||||
|
||||
public async Task<ExportFile> ExportAsync(CardsQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = new List<CardRow>();
|
||||
for (var p = 1; rows.Count < 20000; p++)
|
||||
{
|
||||
var r = await repository.SearchAsync(query, new PageRequest(p, PageRequest.MaxPageSize), ct);
|
||||
rows.AddRange(r.Items);
|
||||
if (r.Items.Count == 0 || rows.Count >= r.TotalCount) break;
|
||||
}
|
||||
var cols = new List<ReportColumn>
|
||||
{
|
||||
new("tn", "رقم الشاحنة", "Truck"), new("cardNumber", "رقم بطاقة جوبترول", "Card number"),
|
||||
new("currentBalance", "الرصيد الحالي", "Current balance"), new("status", "الحالة", "Status"),
|
||||
};
|
||||
var data = rows.Select(r => (IReadOnlyDictionary<string, object?>)new Dictionary<string, object?>
|
||||
{
|
||||
["tn"] = r.Tn, ["cardNumber"] = r.CardNumber, ["currentBalance"] = r.CurrentBalance,
|
||||
["status"] = string.Equals(r.StatusCode, CardValues.Active, StringComparison.OrdinalIgnoreCase) ? "فعال" : "غير فعال",
|
||||
}).ToList();
|
||||
var table = new ReportTable { Key = "REFINERY_CARDS", TitleAr = "بطاقات الديزل", TitleEn = "Diesel cards", Columns = cols, Rows = data };
|
||||
return new ExportFile(excel.Build(table, user.UserId, DateTime.Now, true),
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "REFINERY_CARDS.xlsx");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
using FluentValidation;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.Cards;
|
||||
|
||||
public interface ICardsRepository
|
||||
{
|
||||
/// <summary>Newest first (legacy sort ID DESC).</summary>
|
||||
Task<PagedResult<CardRow>> SearchAsync(CardsQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<CardRow?> GetAsync(long id, CancellationToken ct = default);
|
||||
Task<bool> CardNumberExistsAsync(string cardNumber, CancellationToken ct = default);
|
||||
/// <summary>All cards of a truck (newest first).</summary>
|
||||
Task<IReadOnlyList<CardRow>> GetByTruckAsync(long tn, CancellationToken ct = default);
|
||||
Task<long> InsertAsync(long tn, string cardNumber, decimal balance, string createdBy, CancellationToken ct = default);
|
||||
Task ChangeStatusAsync(long id, string status, string userId, CancellationToken ct = default);
|
||||
Task InsertLogAsync(long cardId, string method, decimal balanceBefore, decimal balanceAfter, decimal amount, string userId, CancellationToken ct = default);
|
||||
Task<PagedResult<CardLogRow>> GetLogAsync(long cardId, PageRequest page, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
public interface ICardsService
|
||||
{
|
||||
Task<PagedResult<CardRow>> SearchAsync(CardsQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<CardRow> GetAsync(long id, CancellationToken ct);
|
||||
Task<PagedResult<CardLogRow>> GetLogAsync(long id, PageRequest page, CancellationToken ct);
|
||||
Task<CardsResult> CreateAsync(CreateCardRequest request, CancellationToken ct);
|
||||
Task<CardsResult> ActivateAsync(long id, CancellationToken ct);
|
||||
Task<CardsResult> DeactivateAsync(long id, CancellationToken ct);
|
||||
Task<ExportFile> ExportAsync(CardsQuery query, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>The create form: truck, card number and opening balance are required (legacy HTML required + bean length check).</summary>
|
||||
public sealed class CreateCardValidator : AbstractValidator<CreateCardRequest>
|
||||
{
|
||||
public CreateCardValidator()
|
||||
{
|
||||
RuleFor(x => x.Tn).GreaterThan(0).LessThan(1_000_000_000_000L).WithMessage(CardsMessages.Required);
|
||||
RuleFor(x => x.CardNumber).NotEmpty().MaximumLength(CardsRules.CardNumberMaxLength).WithMessage(CardsMessages.Required);
|
||||
RuleFor(x => x.CurrentBalance).GreaterThanOrEqualTo(0).LessThan(CardsRules.BalanceLimit).WithMessage(CardsMessages.Required);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Application.Refinery.CommissionClaims;
|
||||
|
||||
/// <summary>REFINERY_COMMISSION_CLAIM_VIEW row. <see cref="TripCnt"/> is the number of wage claims (the legacy column name and grid caption "عدد مطالبات الاجور").</summary>
|
||||
public sealed class CommissionClaimRowDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long? CommissionClaimNo { get; set; }
|
||||
public DateTime? CommissionClaimDate { get; set; }
|
||||
public long TripCnt { get; set; }
|
||||
/// <summary>NEW / COMPLETE (old rows may hold CLOSE).</summary>
|
||||
public string StatusCode { get; set; } = "";
|
||||
}
|
||||
|
||||
/// <summary>Filters of the legacy grid (COMMISSION_CLAIM_NO, COMMISSION_CLAIM_DATE, STATUS_CODE).</summary>
|
||||
public sealed record CommissionClaimQuery(string? CommissionClaimNo, DateOnly? CommissionClaimDate, IReadOnlyList<string> StatusCodes);
|
||||
|
||||
/// <summary>Body of POST commission-claims: the wage claims to group (legacy IDS_ARR).</summary>
|
||||
public sealed record CreateCommissionClaimRequest(IReadOnlyList<long>? WageClaimIds);
|
||||
|
||||
/// <summary>Data the invoice report needs (legacy factory.report).</summary>
|
||||
public sealed class CommissionInvoiceSource
|
||||
{
|
||||
public long CommissionClaimNo { get; set; }
|
||||
/// <summary>WAGE_CLAIM_DATE of the newest wage claim (ORDER BY ID DESC) of the commission claim; null when it has no wage claim.</summary>
|
||||
public DateTime? NewestWageClaimDate { get; set; }
|
||||
public long TripsCount { get; set; }
|
||||
}
|
||||
|
||||
public sealed record InvoiceLine(string Label, long Quantity, decimal PriceWithTax, decimal TotalBeforeTax, decimal TotalWithTax);
|
||||
|
||||
public sealed record CommissionInvoice(
|
||||
string InvoiceNumber, DateOnly InvoiceDate, DateOnly PeriodStart, DateOnly PeriodEnd, IReadOnlyList<InvoiceLine> Lines,
|
||||
decimal TotalBeforeTax, decimal Tax, decimal GrandTotal);
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Application.Refinery.CommissionClaims;
|
||||
|
||||
/// <summary>Pure rules of the commission claim screen (refinery_commission_claimfactory.cfc).</summary>
|
||||
public static class CommissionClaimRules
|
||||
{
|
||||
/// <summary>"العمولة الثابتة": fixed commission per trip, price including tax (factory.report, fixeComission).</summary>
|
||||
public const decimal FixedCommission = 2.00m;
|
||||
/// <summary>The prices include the 16% sales tax (invoice formula =ROUND(total/1.16,3)).</summary>
|
||||
public const decimal TaxDivisor = 1.16m;
|
||||
|
||||
public const string FixedLabel = "العمولة الثابتة";
|
||||
public const string CompetitiveLabel = "العمولة التنافسية";
|
||||
|
||||
/// <summary>factory.create: at least one wage claim chosen.</summary>
|
||||
public static IReadOnlyList<long> NormalizeIds(IEnumerable<long>? ids)
|
||||
{
|
||||
var list = (ids ?? []).Where(i => i > 0).Distinct().ToList();
|
||||
if (list.Count == 0) throw new BusinessException("PLEASE_SELECT_CLAIM", ClaimMessages.PleaseSelectClaim);
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>factory.CLAIM_COMPLETE: every wage claim of the commission claim must be CLOSE (paid).</summary>
|
||||
public static bool AllWageClaimsPaid(IEnumerable<string> wageClaimStatuses) => wageClaimStatuses.All(s => s == WageClaimRules.Close);
|
||||
|
||||
/// <summary>
|
||||
/// Billing period of the invoice: the month BEFORE the date of the newest wage claim (legacy: monthValue = month(date) - 1, January gives
|
||||
/// December of the previous year); the invoice is dated the last day of that month.
|
||||
/// </summary>
|
||||
public static (DateOnly Start, DateOnly End) BillingPeriod(DateTime newestWageClaimDate)
|
||||
{
|
||||
var first = new DateOnly(newestWageClaimDate.Year, newestWageClaimDate.Month, 1).AddMonths(-1);
|
||||
return (first, first.AddMonths(1).AddDays(-1));
|
||||
}
|
||||
|
||||
/// <summary>Invoice line: total = quantity x price (with tax); before tax = ROUND(total / 1.16, 3) (Excel rounds halves away from zero).</summary>
|
||||
public static InvoiceLine Line(string label, long quantity, decimal priceWithTax)
|
||||
{
|
||||
var total = quantity * priceWithTax;
|
||||
return new InvoiceLine(label, quantity, priceWithTax, Math.Round(total / TaxDivisor, 3, MidpointRounding.AwayFromZero), total);
|
||||
}
|
||||
|
||||
/// <summary>Totals row of the invoice: sum before tax, tax = grand total - sum before tax, grand total = sum of the line totals.</summary>
|
||||
public static CommissionInvoice BuildInvoice(long commissionClaimNo, DateTime newestWageClaimDate, long tripsCount, decimal competitiveCommission)
|
||||
{
|
||||
var (start, end) = BillingPeriod(newestWageClaimDate);
|
||||
var lines = new[] { Line(FixedLabel, tripsCount, FixedCommission), Line(CompetitiveLabel, tripsCount, competitiveCommission) };
|
||||
var before = lines.Sum(l => l.TotalBeforeTax);
|
||||
var grand = lines.Sum(l => l.TotalWithTax);
|
||||
return new CommissionInvoice($"INV {commissionClaimNo}", end, start, end, lines, before, grand - before, grand);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Text;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
using static NTP.Application.Refinery.WageClaims.ClaimExcel;
|
||||
|
||||
namespace NTP.Application.Refinery.CommissionClaims;
|
||||
|
||||
public interface ICommissionClaimService
|
||||
{
|
||||
Task<PagedResult<CommissionClaimRowDto>> SearchAsync(CommissionClaimQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<CommissionClaimRowDto> GetAsync(long id, CancellationToken ct);
|
||||
Task<IReadOnlyList<WageClaimRowDto>> WageClaimsAsync(long id, CancellationToken ct);
|
||||
Task<IReadOnlyList<WageClaimRowDto>> CandidateWageClaimsAsync(IReadOnlyList<string>? statusCodes, CancellationToken ct);
|
||||
Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct);
|
||||
Task<ClaimResult> CreateAsync(CreateCommissionClaimRequest request, string? ip, CancellationToken ct);
|
||||
Task<ClaimResult> CompleteAsync(long id, string? ip, CancellationToken ct);
|
||||
Task<ExportFile> ReportAsync(long id, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinery_commission_claimfactory.cfc. Not ported: the no-op "UPDATE REFINERY_WAGE_CLAIM ... status_Code in ('NEW,CLOSE')" after the create
|
||||
/// (a single quoted string never matches) and the TRIP_COMPLETE call of CLAIM_COMPLETE that passed the COMMISSION claim id as a trip id.
|
||||
/// </summary>
|
||||
public sealed class CommissionClaimService(ICommissionClaimRepository repo, IUnitOfWork unit, ICurrentUser user) : ICommissionClaimService
|
||||
{
|
||||
/// <summary>Statuses of the wage claims the create dialog offers by default (REFINERY_COMMISSION_CLAIMMain.html: NEW and CLOSE selected).</summary>
|
||||
private static readonly string[] CandidateStatuses = [WageClaimRules.New, WageClaimRules.Close];
|
||||
|
||||
public Task<PagedResult<CommissionClaimRowDto>> SearchAsync(CommissionClaimQuery query, PageRequest page, CancellationToken ct) => repo.SearchAsync(query, page, ct);
|
||||
|
||||
public async Task<CommissionClaimRowDto> GetAsync(long id, CancellationToken ct) =>
|
||||
await repo.GetAsync(id, ct) ?? throw new NotFoundException("REFINERY_COMMISSION_CLAIM", id);
|
||||
|
||||
public async Task<IReadOnlyList<WageClaimRowDto>> WageClaimsAsync(long id, CancellationToken ct)
|
||||
{
|
||||
await GetAsync(id, ct);
|
||||
return await repo.WageClaimsOfAsync(id, ct);
|
||||
}
|
||||
|
||||
public Task<IReadOnlyList<WageClaimRowDto>> CandidateWageClaimsAsync(IReadOnlyList<string>? statusCodes, CancellationToken ct)
|
||||
{
|
||||
var wanted = (statusCodes ?? [])
|
||||
.SelectMany(s => (s ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
.Select(s => s.ToUpperInvariant()).Where(s => s is WageClaimRules.New or WageClaimRules.Close).Distinct().ToList();
|
||||
return repo.CandidateWageClaimsAsync(wanted.Count == 0 ? CandidateStatuses : wanted, ct);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
await GetAsync(id, ct);
|
||||
return await repo.LogAsync(id, page, ct);
|
||||
}
|
||||
|
||||
/// <summary>factory.create: groups the chosen wage claims that have no commission claim yet under a new NEW commission claim.</summary>
|
||||
public async Task<ClaimResult> CreateAsync(CreateCommissionClaimRequest request, string? ip, CancellationToken ct)
|
||||
{
|
||||
var ids = CommissionClaimRules.NormalizeIds(request.WageClaimIds);
|
||||
var id = await unit.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
if (await repo.CountAttachableAsync(ids, c) == 0) throw new BusinessException("NO_WAGES", ClaimMessages.NoWages);
|
||||
var claimId = await repo.InsertAsync(user.UserId, c);
|
||||
await repo.AttachWageClaimsAsync(claimId, ids, c);
|
||||
await repo.AddLogAsync(claimId, "CREATE", "{}", ClaimLogJson.Status(WageClaimRules.New), user.Id, ip, c);
|
||||
return claimId;
|
||||
}, ct);
|
||||
return new ClaimResult(ClaimMessages.Success, id);
|
||||
}
|
||||
|
||||
/// <summary>factory.CLAIM_COMPLETE: NEW claim, every wage claim CLOSE -> wage claims COMPLETE (+ their log), commission claim COMPLETE (+ log CLAIM_CLOSE).</summary>
|
||||
public async Task<ClaimResult> CompleteAsync(long id, string? ip, CancellationToken ct)
|
||||
{
|
||||
var claim = await GetAsync(id, ct);
|
||||
if (claim.StatusCode != WageClaimRules.New) throw new BusinessException("NO_AUTHORITY", ClaimMessages.NoAuthority);
|
||||
// legacy returned the error in the middle of the loop; nothing is changed here unless all wage claims are paid
|
||||
if (!CommissionClaimRules.AllWageClaimsPaid(await repo.WageClaimStatusesAsync(id, ct)))
|
||||
throw new BusinessException("WAGE_CLAIM_NOT_CLOSE", ClaimMessages.WageClaimNotClose);
|
||||
|
||||
await unit.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
await repo.CompleteWageClaimsAsync(id, user.UserId, user.Id, ip, c);
|
||||
await repo.SetStatusAsync(id, WageClaimRules.Complete, user.UserId, c);
|
||||
await repo.AddLogAsync(id, "CLAIM_CLOSE", ClaimLogJson.Status(ClaimMessages.StatusNew), ClaimLogJson.Status(ClaimMessages.StatusComplete), user.Id, ip, c);
|
||||
return 0;
|
||||
}, ct);
|
||||
return new ClaimResult(ClaimMessages.Success, id);
|
||||
}
|
||||
|
||||
/// <summary>factory.report: the monthly invoice of the commissions (fixed commission and competitive commission per trip, 16% tax included).</summary>
|
||||
public async Task<ExportFile> ReportAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var src = await repo.InvoiceSourceAsync(id, ct) ?? throw new NotFoundException("REFINERY_COMMISSION_CLAIM", id);
|
||||
if (src.NewestWageClaimDate is null) throw new BusinessException("NO_TRIPS", ClaimMessages.NoTripsIssue);
|
||||
var (start, _) = CommissionClaimRules.BillingPeriod(src.NewestWageClaimDate.Value);
|
||||
var competitive = await repo.CommissionVariableAsync(start.Month, start.Year, ct)
|
||||
?? throw new BusinessException("COMMISSION_VARIABLE", ClaimMessages.CommissionVariableIssue);
|
||||
var inv = CommissionClaimRules.BuildInvoice(src.CommissionClaimNo, src.NewestWageClaimDate.Value, src.TripsCount, competitive);
|
||||
return RenderInvoice(inv, src.CommissionClaimNo);
|
||||
}
|
||||
|
||||
private static string Money(decimal v) => v.ToString("#,##0.000", CultureInfo.InvariantCulture);
|
||||
private static string Day(DateOnly d) => d.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture);
|
||||
|
||||
/// <summary>Texts of the legacy invoice template (company, customer, columns, totals). Opened by Excel as an HTML table.</summary>
|
||||
internal static ExportFile RenderInvoice(CommissionInvoice inv, long commissionClaimNo)
|
||||
{
|
||||
var h = new StringBuilder();
|
||||
h.Append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>");
|
||||
h.Append("<table dir=\"rtl\" border=\"1\" align=\"center\" cellpadding=\"4\">");
|
||||
h.Append("<tr><td colspan=\"4\" align=\"center\"><b>شركة نافذ للخدمات اللوجستية</b></td><td colspan=\"3\" align=\"center\"><b>الفاتورة الشهرية -عمولات صرف اجور النقل</b></td></tr>");
|
||||
h.Append($"<tr><td>التاريخ :</td><td>{Day(inv.InvoiceDate)}</td><td colspan=\"3\"></td><td>رقم الضريبي :</td><td>16669690</td></tr>");
|
||||
h.Append($"<tr><td>رقم الفاتورة :</td><td>{E(inv.InvoiceNumber)}</td><td colspan=\"5\"></td></tr>");
|
||||
h.Append($"<tr><td>من / إلى</td><td>{Day(inv.PeriodStart)}</td><td>/</td><td>{Day(inv.PeriodEnd)}</td><td colspan=\"3\"></td></tr>");
|
||||
h.Append("<tr><td>رقم الشركة :</td><td>03-100002</td><td colspan=\"5\"></td></tr>");
|
||||
h.Append("<tr><td>اسم الشركة :</td><td colspan=\"6\">السادة شركة مصفاة البترول الأردنية المساهمة المحدودة</td></tr>");
|
||||
h.Append("<tr><td>العنوان :</td><td colspan=\"6\">الادارة العامة - عمان , الدوار الاول ,شارع الرينبو</td></tr>");
|
||||
h.Append("<tr><td colspan=\"2\">رقم الهاتف : 4630151-06</td><td colspan=\"2\">الفاكس : 4657939-06</td><td colspan=\"3\">البريد الالكتروني:Addewan@Jopetrol.com.jo</td></tr>");
|
||||
h.Append("<tr align=\"center\" bgcolor=\"#034878\"><td><font color=\"#FFFFFF\">البيان</font></td><td colspan=\"4\"></td>");
|
||||
h.Append("<td><font color=\"#FFFFFF\">عدد الارساليات</font></td><td><font color=\"#FFFFFF\">السعر شامل الضريبة</font></td>");
|
||||
h.Append("<td><font color=\"#FFFFFF\">المجموع قبل الضريبة</font></td><td><font color=\"#FFFFFF\">المجموع شامل الضريبة</font></td></tr>");
|
||||
foreach (var l in inv.Lines)
|
||||
h.Append($"<tr align=\"center\"><td>{E(l.Label)}</td><td colspan=\"4\"></td><td>{l.Quantity}</td><td>{Money(l.PriceWithTax)}</td><td>{Money(l.TotalBeforeTax)}</td><td>{Money(l.TotalWithTax)}</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"5\"></td><td colspan=\"3\">المجموع قبل الضريبة</td><td>{Money(inv.TotalBeforeTax)}</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"5\"></td><td colspan=\"2\">ضريبة المبيعات</td><td>0.16</td><td>{Money(inv.Tax)}</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"5\"></td><td colspan=\"3\"><b>المجموع الأجمالي بالدينار الاردني</b></td><td><b>{Money(inv.GrandTotal)}</b></td></tr>");
|
||||
h.Append("<tr><td>اسم المستلم:</td><td colspan=\"3\"></td><td colspan=\"2\">شركة نافذ للخدمات اللوجستية</td><td colspan=\"2\"></td></tr>");
|
||||
h.Append("<tr><td>تاريخ الاستلام:</td><td colspan=\"3\"></td><td colspan=\"4\"></td></tr>");
|
||||
h.Append("<tr><td>الختم والتوقيع:</td><td colspan=\"3\"></td><td colspan=\"2\">الختم والتوقيع:</td><td colspan=\"2\"></td></tr>");
|
||||
h.Append("<tr align=\"center\"><td colspan=\"8\">مكتب الادارة - أبراج الحجاز، شارع مكة 158، مكتب 401 - ص.ب 995، عمان 11821، الأردن - هـ 6553629 962 - موقع www.nafith.com</td></tr>");
|
||||
h.Append("</table></body></html>");
|
||||
var bytes = new UTF8Encoding(true).GetPreamble().Concat(Encoding.UTF8.GetBytes(h.ToString())).ToArray();
|
||||
return new ExportFile(bytes, "application/vnd.ms-excel", $"refinery_commission_claim_{commissionClaimNo}.xls");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Application.Refinery.CommissionClaims;
|
||||
|
||||
/// <summary>
|
||||
/// SQL of refinery_commission_claimdao.cfc and the writes of refinery_commission_claimfactory.cfc. Besides its own tables it writes
|
||||
/// REFINERY_WAGE_CLAIM (COMMISSION_CLAIM_ID when grouping; STATUS_CODE COMPLETE + REFINERY_WAGE_CLAIM_LOG when completing).
|
||||
/// </summary>
|
||||
public interface ICommissionClaimRepository
|
||||
{
|
||||
Task<PagedResult<CommissionClaimRowDto>> SearchAsync(CommissionClaimQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<CommissionClaimRowDto?> GetAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>Wage claims grouped by the commission claim (legacy searchWageClaim with COMMISSION_CLAIM_ID).</summary>
|
||||
Task<IReadOnlyList<WageClaimRowDto>> WageClaimsOfAsync(long commissionClaimId, CancellationToken ct = default);
|
||||
/// <summary>Wage claims without a commission claim in the given statuses (legacy searchWageClaim, create dialog).</summary>
|
||||
Task<IReadOnlyList<WageClaimRowDto>> CandidateWageClaimsAsync(IReadOnlyList<string> statuses, CancellationToken ct = default);
|
||||
|
||||
Task<int> CountAttachableAsync(IReadOnlyList<long> wageClaimIds, CancellationToken ct = default);
|
||||
/// <summary>Takes the next claim number (legacy GenerateSerialNumber) and inserts the claim as NEW; returns its id. Run inside a transaction.</summary>
|
||||
Task<long> InsertAsync(string createdBy, CancellationToken ct = default);
|
||||
Task<int> AttachWageClaimsAsync(long commissionClaimId, IReadOnlyList<long> wageClaimIds, CancellationToken ct = default);
|
||||
|
||||
Task<IReadOnlyList<string>> WageClaimStatusesAsync(long commissionClaimId, CancellationToken ct = default);
|
||||
/// <summary>Every wage claim of the commission claim -> COMPLETE with a REFINERY_WAGE_CLAIM_LOG row (method COMPLETE, CLOSE -> COMPLETE).</summary>
|
||||
Task<int> CompleteWageClaimsAsync(long commissionClaimId, string userLogin, long userId, string? ip, CancellationToken ct = default);
|
||||
Task SetStatusAsync(long id, string status, string userLogin, CancellationToken ct = default);
|
||||
|
||||
Task AddLogAsync(long id, string method, string? oldData, string? newData, long userId, string? ip, CancellationToken ct = default);
|
||||
Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct = default);
|
||||
|
||||
Task<CommissionInvoiceSource?> InvoiceSourceAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>REFINERY_VARIABLES COMMISSION valid for the month / year (legacy month and year range test); null when not defined.</summary>
|
||||
Task<decimal?> CommissionVariableAsync(int month, int year, CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Integrations;
|
||||
|
||||
/// <summary>
|
||||
/// Companion of <see cref="IDinarakGateway"/> (whose signatures are fixed): REFINERY_TRIPS.DINARAK_REFERENCE_ID is a decimal (352.1, 352.11 ...)
|
||||
/// because ACTIVATE_WALLET_EXCHANGE adds 0.01 to it, so the status lookup by message id needs a decimal parameter.
|
||||
/// The same class implements both interfaces.
|
||||
/// </summary>
|
||||
public interface IDinarakReferenceGateway
|
||||
{
|
||||
/// <summary>
|
||||
/// Legacy getTransferByMessageID. <c>StatusName</c> is the Dinarak status ("Success", "Processing", "New", ...), "DISABLED" when the
|
||||
/// integration is switched off (nothing is called) and "ERROR" when the answer could not be obtained or read.
|
||||
/// </summary>
|
||||
Task<DinarakTransferStatus> GetTransferByReferenceAsync(decimal reference, CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Integrations;
|
||||
|
||||
/// <summary>Result of a Dinarak e-wallet transfer. Codes as legacy RefinaryDinarakApi.ProcessTransfer: 000 ok, 101 amount mismatch,
|
||||
/// 102 refused by Dinarak, 103 HTTP error, 104 invalid wallet / system error, 105 already paid, 106 integration disabled by configuration.</summary>
|
||||
public sealed record DinarakTransferResult(string Code, string Message)
|
||||
{
|
||||
public bool Success => Code == "000";
|
||||
}
|
||||
|
||||
/// <summary>State of a transfer looked up by message id (legacy getTransferByMessageID): Success / Processing / New count as accepted.</summary>
|
||||
public sealed record DinarakTransferStatus(bool Accepted, string? StatusName, string? RawResponse);
|
||||
|
||||
/// <summary>
|
||||
/// Dinarak payment API (legacy backend/common/RefinaryDinarakApi.cfc). The implementation lives in NTP.Infrastructure, is OFF unless
|
||||
/// configuration enables it (Refinery:Dinarak:Enabled) and takes URL / user / password only from configuration (server .env).
|
||||
/// Every call writes REFINERY_DINARAK_API_LOG like the legacy code. When disabled it returns code 106 and calls nothing.
|
||||
/// </summary>
|
||||
public interface IDinarakGateway
|
||||
{
|
||||
Task<DinarakTransferResult> TransferAsync(long tripId, string walletNumber, string nnpn, decimal amount, string receiverName, CancellationToken ct = default);
|
||||
Task<DinarakTransferStatus> GetTransferByMessageIdAsync(long messageId, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Jopetrol claim web service (legacy refinery_wage_claimfactory.callRefinaryUpdateStatusTo7, SOAP sendClaimandUpdateStatusTo7).
|
||||
/// OFF unless configuration enables it (Refinery:Jopetrol:Enabled); URL / user / password only from configuration. Returns the text of
|
||||
/// the service answer, or null when the integration is disabled.
|
||||
/// </summary>
|
||||
public interface IJopetrolGateway
|
||||
{
|
||||
Task<string?> SendClaimAndUpdateStatusTo7Async(string pn, string claimNo, CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
/// <summary>One truck's carried-over balance (REFINERY_REMAINING_BALANCE).</summary>
|
||||
public sealed class RemainingBalanceRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long Tn { get; set; }
|
||||
public decimal RemainingBalance { get; set; }
|
||||
public decimal? BeforeRemainingBalance { get; set; }
|
||||
}
|
||||
|
||||
public interface IRemainingBalanceRepository
|
||||
{
|
||||
Task<RemainingBalanceRow?> GetByTruckAsync(string tn, CancellationToken ct = default);
|
||||
/// <summary>Sets REMAINING_BALANCE to 0 and keeps the old value in BEFORE_REMAINING_BALANCE (legacy Zeroing).</summary>
|
||||
Task ZeroAsync(string tn, string userId, CancellationToken ct = default);
|
||||
/// <summary>Adds <paramref name="delta"/> to the balance (BEFORE_REMAINING_BALANCE = old value); false when the truck has no row.</summary>
|
||||
Task<bool> AddAsync(string tn, decimal delta, string userId, CancellationToken ct = default);
|
||||
Task CreateAsync(string tn, decimal balance, string userId, CancellationToken ct = default);
|
||||
/// <summary>REFINERY_REMAINING_BALANCE_LOG row (variableGroupId only when the change comes from a re-pricing).</summary>
|
||||
Task InsertLogAsync(long balanceId, decimal amount, decimal balanceBefore, long tripId, long? variableGroupId, string loginId, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
public interface IRemainingBalanceService
|
||||
{
|
||||
/// <summary>Balance carried by the truck, or null when it has no row (legacy getByTN).</summary>
|
||||
Task<decimal?> GetAsync(string tn, CancellationToken ct = default);
|
||||
|
||||
/// <summary>
|
||||
/// Legacy refinerytripfactory.setRemainigBalance: after a trip is paid, the balance it consumed is set back to 0 and logged
|
||||
/// (nothing when the truck has no balance row). Runs in the caller's transaction.
|
||||
/// </summary>
|
||||
Task ResetAfterPaymentAsync(string tn, long tripId, CancellationToken ct = default);
|
||||
|
||||
/// <summary>
|
||||
/// Legacy refinery_remaining_balanceDAO.setRemainingBalance: adds <paramref name="delta"/> to the truck's balance (creates the row
|
||||
/// when missing) and writes the log row. Runs in the caller's transaction.
|
||||
/// </summary>
|
||||
Task AddAsync(string tn, decimal delta, long tripId, long variableGroupId, CancellationToken ct = default);
|
||||
|
||||
/// <summary>
|
||||
/// Legacy refinerytripfactory.calculateRemainigBalance: after the ton price (penalty price) of a period was corrected, the
|
||||
/// difference of every penalised trip of the period is added to its truck's balance. The variables screen calls it after
|
||||
/// saving a corrected price; also available as POST refinery/trips/remaining-balance/recalculate.
|
||||
/// </summary>
|
||||
Task<TripsResult> RecalculateForPeriodAsync(DateTime startDate, DateTime endDate, long variableGroupId, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
/// <summary>Port of refinery_remaining_balanceDAO.cfc plus setRemainigBalance / calculateRemainigBalance of refinerytripfactory.cfc.</summary>
|
||||
public sealed class RemainingBalanceService(
|
||||
IRemainingBalanceRepository balances,
|
||||
ITripRepository trips,
|
||||
IUnitOfWork unitOfWork,
|
||||
ICurrentUser user) : IRemainingBalanceService
|
||||
{
|
||||
public async Task<decimal?> GetAsync(string tn, CancellationToken ct = default) =>
|
||||
(await balances.GetByTruckAsync(tn, ct))?.RemainingBalance;
|
||||
|
||||
// refinerytripfactory.cfc:1246-1267. The legacy call sites guard it with len(x gt 0), which is always true: the balance is
|
||||
// reset after every payment whenever the truck has a balance row.
|
||||
public async Task ResetAfterPaymentAsync(string tn, long tripId, CancellationToken ct = default)
|
||||
{
|
||||
var row = await balances.GetByTruckAsync(tn, ct);
|
||||
if (row is null) return;
|
||||
await balances.ZeroAsync(tn, user.Id.ToString(), ct);
|
||||
// log: AMOUNT 0, balance before = what it was; CREATED_BY = login (legacy sessionstruct.userid)
|
||||
await balances.InsertLogAsync(row.Id, 0, row.RemainingBalance, tripId, null, user.UserId, ct);
|
||||
}
|
||||
|
||||
// refinery_remaining_balanceDAO.cfc:67-98 (the legacy create() was broken for a missing row; here the row is created and logged)
|
||||
public async Task AddAsync(string tn, decimal delta, long tripId, long variableGroupId, CancellationToken ct = default)
|
||||
{
|
||||
var userId = user.Id.ToString();
|
||||
var updated = await balances.AddAsync(tn, delta, userId, ct);
|
||||
if (!updated) await balances.CreateAsync(tn, delta, userId, ct);
|
||||
var row = await balances.GetByTruckAsync(tn, ct)
|
||||
?? throw new InvalidOperationException($"Remaining balance row of truck {tn} was not found after update.");
|
||||
await balances.InsertLogAsync(row.Id, row.RemainingBalance, row.BeforeRemainingBalance ?? 0, tripId, variableGroupId, user.UserId, ct);
|
||||
}
|
||||
|
||||
// refinerytripfactory.cfc:1269-1315
|
||||
public async Task<TripsResult> RecalculateForPeriodAsync(DateTime startDate, DateTime endDate, long variableGroupId, CancellationToken ct = default)
|
||||
{
|
||||
var list = await trips.GetTripsOfPeriodAsync(startDate.Date, endDate.Date, ct);
|
||||
if (list.Count == 0) throw TripErrors.NoTripsInPeriod();
|
||||
if (list.Any(t => t.StatusCode is not null && TripStatus.BlockRepricing.Contains(t.StatusCode)))
|
||||
throw TripErrors.NotAllExchanged();
|
||||
|
||||
return await unitOfWork.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
foreach (var t in list.Where(t => t.PenaltyAmount > 0))
|
||||
{
|
||||
if (t.LoadingDate is null || t.Tn is null) continue;
|
||||
var vars = TripVariables.FromPairs(await trips.GetVariablesAsync(t.LoadingDate.Value.Date, c));
|
||||
var weights = new TripWeights(t.NetLoadingWeight ?? 0, t.NetDischargeWeight ?? 0, t.WaterAmount ?? 0, await trips.GetWaterFlagAsync(t.Id, c));
|
||||
var corrected = TripCalculator.Calculate(weights, vars, null, useTonPriceCorrection: true);
|
||||
// legacy: calculatedAmounts.NET_WAGE neq trip.NET_WAGE, then delta = corrected NET_WAGE - TRIP_NET_WAGE
|
||||
if (corrected.NetWage != (t.NetWage ?? 0))
|
||||
await AddAsync(t.Tn, corrected.NetWage - (t.TripNetWage ?? 0), t.Id, variableGroupId, c);
|
||||
}
|
||||
return new TripsResult(TripErrors.Ok);
|
||||
}, ct);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,291 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.IO.Compression;
|
||||
using System.Security;
|
||||
using System.Text;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
/// <summary>
|
||||
/// One report in the layout of the legacy AqabaTCS reports (backend/common/report.cfc): company name and title on the first row,
|
||||
/// the applied filters as label / value pairs, a spacer row, the column captions, then the rows. The first column is the counter
|
||||
/// (متسلسل). <see cref="WidthsPt"/> are the legacy column widths in points.
|
||||
/// </summary>
|
||||
public sealed record LegacyReport(
|
||||
string CompanyName,
|
||||
string Title,
|
||||
IReadOnlyList<(string Label, string Value)> Filters,
|
||||
IReadOnlyList<string> Headers,
|
||||
IReadOnlyList<int> WidthsPt,
|
||||
IReadOnlyList<IReadOnlyList<object?>> Rows);
|
||||
|
||||
/// <summary>
|
||||
/// The legacy الحوالات list (refineryBankReport, companyreport.cfr): a banner with the company and the list title, a block with the
|
||||
/// account details and the total, then the trips table. <see cref="Info"/> are the label / value rows of the block; <see cref="WidthsChars"/>
|
||||
/// are the column widths in characters.
|
||||
/// </summary>
|
||||
public sealed record TransfersReport(
|
||||
string CompanyName,
|
||||
string Title,
|
||||
IReadOnlyList<(string Label, object? Value)> Info,
|
||||
IReadOnlyList<string> Headers,
|
||||
IReadOnlyList<double> WidthsChars,
|
||||
IReadOnlyList<IReadOnlyList<object?>> Rows);
|
||||
|
||||
/// <summary>
|
||||
/// Writes legacy-style reports as .xlsx workbooks (right-to-left sheet, Arial Unicode MS 11, centred and wrapped cells, navy #003366 header
|
||||
/// cells with white text, thin borders). Strings are written as inline strings, so cell text can never be evaluated as a formula.
|
||||
/// </summary>
|
||||
public static class LegacyReportWorkbook
|
||||
{
|
||||
private const string Font = "Arial Unicode MS";
|
||||
|
||||
// cellXfs indexes of the report.cfc style sheet below
|
||||
private const int Company = 1, Title = 2, Header = 3, FilterValue = 4, Data = 5;
|
||||
// cellXfs indexes of the transfers style sheet
|
||||
private const int TBanner = 1, TLabel = 2, TValue = 3, THeader = 4, TData = 5;
|
||||
|
||||
/// <summary>Legacy widths are points (ss:Width); the sheet needs characters: ((pt * 4/3) - 5) / 7.</summary>
|
||||
public static double Chars(int points) => Math.Round((points * 4.0 / 3.0 - 5) / 7, 2);
|
||||
|
||||
public static byte[] ToXlsx(LegacyReport r) => Package(r.Title, Styles(), Sheet(r));
|
||||
|
||||
public static byte[] ToTransfersXlsx(TransfersReport r) => Package(r.Title, TransfersStyles(), TransfersSheet(r));
|
||||
|
||||
private static byte[] Package(string title, string styles, string sheet)
|
||||
{
|
||||
using var ms = new MemoryStream();
|
||||
using (var zip = new ZipArchive(ms, ZipArchiveMode.Create, leaveOpen: true))
|
||||
{
|
||||
Add(zip, "[Content_Types].xml",
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/><Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/><Override PartName=\"/xl/worksheets/sheet1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/><Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/></Types>");
|
||||
Add(zip, "_rels/.rels",
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"xl/workbook.xml\"/></Relationships>");
|
||||
Add(zip, "xl/workbook.xml",
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"><sheets><sheet name=\""
|
||||
+ Esc(SheetName(title)) + "\" sheetId=\"1\" r:id=\"rId1\"/></sheets></workbook>");
|
||||
Add(zip, "xl/_rels/workbook.xml.rels",
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet\" Target=\"worksheets/sheet1.xml\"/><Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/></Relationships>");
|
||||
Add(zip, "xl/styles.xml", styles);
|
||||
Add(zip, "xl/worksheets/sheet1.xml", sheet);
|
||||
}
|
||||
return ms.ToArray();
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ report.cfc layout
|
||||
/// <summary>Style sheet: fonts 0 normal, 1 navy 14, 2 white 11, 3 black 12; fills 2 navy, 3 grey; borders 1 all thin black, 2 data row.</summary>
|
||||
internal static string Styles()
|
||||
{
|
||||
static string F(int size, string color) => $"<font><sz val=\"{size}\"/><color rgb=\"{color}\"/><name val=\"{Font}\"/></font>";
|
||||
static string B(string l, string r, string t, string b) =>
|
||||
$"<border><left style=\"thin\"><color rgb=\"{l}\"/></left><right style=\"thin\"><color rgb=\"{r}\"/></right><top style=\"{(t.Length > 0 ? "thin" : "none")}\">{(t.Length > 0 ? $"<color rgb=\"{t}\"/>" : "")}</top><bottom style=\"thin\"><color rgb=\"{b}\"/></bottom><diagonal/></border>";
|
||||
static string X(int font, int fill, int border, string h, string v) =>
|
||||
$"<xf numFmtId=\"0\" fontId=\"{font}\" fillId=\"{fill}\" borderId=\"{border}\" xfId=\"0\" applyFont=\"1\" applyFill=\"1\" applyBorder=\"1\" applyAlignment=\"1\"><alignment horizontal=\"{h}\" vertical=\"{v}\" wrapText=\"1\"/></xf>";
|
||||
var sb = new StringBuilder();
|
||||
sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">");
|
||||
sb.Append("<fonts count=\"4\">").Append(F(11, "FF000000")).Append(F(14, "FF003366")).Append(F(11, "FFFFFFFF")).Append(F(12, "FF000000")).Append("</fonts>");
|
||||
sb.Append("<fills count=\"4\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill>")
|
||||
.Append("<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FF003366\"/><bgColor indexed=\"64\"/></patternFill></fill>")
|
||||
.Append("<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FFC0C0C0\"/><bgColor indexed=\"64\"/></patternFill></fill></fills>");
|
||||
sb.Append("<borders count=\"3\"><border><left/><right/><top/><bottom/><diagonal/></border>")
|
||||
.Append(B("FF000000", "FF000000", "FF000000", "FF000000")) // header: black box
|
||||
.Append(B("FF666699", "FF666699", "", "FF000000")) // data: violet sides, black bottom
|
||||
.Append("</borders>");
|
||||
sb.Append("<cellStyleXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/></cellStyleXfs>");
|
||||
sb.Append("<cellXfs count=\"6\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>")
|
||||
.Append(X(1, 0, 0, "right", "top")) // 1 company name
|
||||
.Append(X(1, 0, 0, "center", "center")) // 2 title
|
||||
.Append(X(2, 2, 1, "center", "top")) // 3 header / filter label
|
||||
.Append(X(3, 3, 0, "center", "top")) // 4 filter value
|
||||
.Append(X(0, 0, 2, "center", "top")) // 5 data
|
||||
.Append("</cellXfs></styleSheet>");
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
private static string Sheet(LegacyReport r)
|
||||
{
|
||||
var cols = r.Headers.Count;
|
||||
var sb = new StringBuilder();
|
||||
sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">");
|
||||
sb.Append("<sheetViews><sheetView rightToLeft=\"1\" workbookViewId=\"0\"/></sheetViews><sheetFormatPr defaultRowHeight=\"15\"/>");
|
||||
sb.Append("<cols>");
|
||||
for (var c = 0; c < cols; c++)
|
||||
Col(sb, c, Chars(c < r.WidthsPt.Count ? r.WidthsPt[c] : 150));
|
||||
sb.Append("</cols><sheetData>");
|
||||
|
||||
// row 1: company name over the first three columns, title over columns E:F (legacy cell layout)
|
||||
sb.Append("<row r=\"1\" ht=\"30\" customHeight=\"1\">");
|
||||
Text(sb, 0, 1, r.CompanyName, Company);
|
||||
Blank(sb, 1, 1, Company); Blank(sb, 2, 1, Company);
|
||||
Text(sb, 4, 1, r.Title, Title);
|
||||
Blank(sb, 5, 1, Title);
|
||||
sb.Append("</row>");
|
||||
|
||||
// row 2: filters as label / value pairs
|
||||
sb.Append("<row r=\"2\" ht=\"20\" customHeight=\"1\">");
|
||||
var fc = 0;
|
||||
foreach (var (label, value) in r.Filters)
|
||||
{
|
||||
Text(sb, fc++, 2, label, Header);
|
||||
Text(sb, fc++, 2, value, FilterValue);
|
||||
}
|
||||
sb.Append("</row>");
|
||||
|
||||
// row 3: spacer, row 4: column captions
|
||||
sb.Append("<row r=\"3\" ht=\"9.94\" customHeight=\"1\"/>");
|
||||
sb.Append("<row r=\"4\" ht=\"20.06\" customHeight=\"1\">");
|
||||
for (var c = 0; c < cols; c++) Text(sb, c, 4, r.Headers[c], Header);
|
||||
sb.Append("</row>");
|
||||
|
||||
var rowNo = 5;
|
||||
foreach (var row in r.Rows)
|
||||
{
|
||||
sb.Append("<row r=\"").Append(rowNo).Append("\" ht=\"24.06\">");
|
||||
for (var c = 0; c < cols && c < row.Count; c++) Value(sb, c, rowNo, row[c], Data);
|
||||
sb.Append("</row>");
|
||||
rowNo++;
|
||||
}
|
||||
sb.Append("</sheetData><mergeCells count=\"2\"><mergeCell ref=\"A1:C1\"/><mergeCell ref=\"E1:F1\"/></mergeCells></worksheet>");
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ الحوالات layout (companyreport.cfr output)
|
||||
/// <summary>
|
||||
/// Style sheet read from a legacy output file: fonts 1 Arial bold 21 (banner), 2 bold white 11 (labels), 3 bold black 11 (values), 4 white 11
|
||||
/// (column captions), 0 black 11 (data); navy #003366 fills; thin borders, violet (#666699) sides on the data rows.
|
||||
/// </summary>
|
||||
internal static string TransfersStyles()
|
||||
{
|
||||
static string Fn(string name, int size, string color, bool bold) =>
|
||||
$"<font>{(bold ? "<b/>" : "")}<sz val=\"{size}\"/><color rgb=\"{color}\"/><name val=\"{name}\"/></font>";
|
||||
static string X(int font, int fill, int border, string h) =>
|
||||
$"<xf numFmtId=\"0\" fontId=\"{font}\" fillId=\"{fill}\" borderId=\"{border}\" xfId=\"0\" applyFont=\"1\" applyFill=\"1\" applyBorder=\"1\" applyAlignment=\"1\"><alignment horizontal=\"{h}\" vertical=\"center\" wrapText=\"1\"/></xf>";
|
||||
var sb = new StringBuilder();
|
||||
sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">");
|
||||
sb.Append("<fonts count=\"5\">").Append(Fn(Font, 11, "FF000000", false)).Append(Fn("Arial", 21, "FF000000", true))
|
||||
.Append(Fn(Font, 11, "FFFFFFFF", true)).Append(Fn(Font, 11, "FF000000", true)).Append(Fn(Font, 11, "FFFFFFFF", false)).Append("</fonts>");
|
||||
sb.Append("<fills count=\"4\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill>")
|
||||
.Append("<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FF003366\"/><bgColor indexed=\"64\"/></patternFill></fill>")
|
||||
.Append("<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FFFFFFFF\"/><bgColor indexed=\"64\"/></patternFill></fill></fills>");
|
||||
sb.Append("<borders count=\"3\"><border><left/><right/><top/><bottom/><diagonal/></border>")
|
||||
.Append("<border><left style=\"thin\"><color rgb=\"FF000000\"/></left><right style=\"thin\"><color rgb=\"FF000000\"/></right><top style=\"thin\"><color rgb=\"FF000000\"/></top><bottom style=\"thin\"><color rgb=\"FF000000\"/></bottom><diagonal/></border>")
|
||||
.Append("<border><left style=\"thin\"><color rgb=\"FF666699\"/></left><right style=\"thin\"><color rgb=\"FF666699\"/></right><top/><bottom style=\"thin\"><color rgb=\"FF000000\"/></bottom><diagonal/></border>")
|
||||
.Append("</borders>");
|
||||
sb.Append("<cellStyleXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/></cellStyleXfs>");
|
||||
sb.Append("<cellXfs count=\"6\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>")
|
||||
.Append(X(1, 0, 0, "center")) // 1 banner (company, title)
|
||||
.Append(X(2, 2, 1, "center")) // 2 label of the account block
|
||||
.Append(X(3, 3, 1, "right")) // 3 value of the account block
|
||||
.Append(X(4, 2, 1, "center")) // 4 column caption
|
||||
.Append(X(0, 3, 2, "center")) // 5 data
|
||||
.Append("</cellXfs></styleSheet>");
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
private static string TransfersSheet(TransfersReport r)
|
||||
{
|
||||
var cols = r.Headers.Count;
|
||||
var last = TabularExport.ColumnName(cols - 1);
|
||||
var merges = new List<string>();
|
||||
var sb = new StringBuilder();
|
||||
sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">");
|
||||
sb.Append("<sheetViews><sheetView rightToLeft=\"1\" workbookViewId=\"0\"/></sheetViews><sheetFormatPr defaultRowHeight=\"12.75\"/>");
|
||||
sb.Append("<cols>");
|
||||
for (var c = 0; c < cols; c++) Col(sb, c, c < r.WidthsChars.Count ? r.WidthsChars[c] : 14);
|
||||
sb.Append("</cols><sheetData>");
|
||||
|
||||
// rows 1-3: company, title, blank banner row, each merged over the whole table width
|
||||
void Banner(int row, string? text)
|
||||
{
|
||||
sb.Append("<row r=\"").Append(row).Append("\" ht=\"27.75\" customHeight=\"1\">");
|
||||
if (text is null) Blank(sb, 0, row, TBanner); else Text(sb, 0, row, text, TBanner);
|
||||
for (var c = 1; c < cols; c++) Blank(sb, c, row, TBanner);
|
||||
sb.Append("</row>");
|
||||
merges.Add($"A{row}:{last}{row}");
|
||||
}
|
||||
Banner(1, r.CompanyName);
|
||||
Banner(2, r.Title);
|
||||
Banner(3, null);
|
||||
|
||||
// account block: label over A:B, value over C:last
|
||||
var rowNo = 4;
|
||||
foreach (var (label, value) in r.Info)
|
||||
{
|
||||
sb.Append("<row r=\"").Append(rowNo).Append("\" ht=\"28.5\" customHeight=\"1\">");
|
||||
Text(sb, 0, rowNo, label, TLabel);
|
||||
Blank(sb, 1, rowNo, TLabel);
|
||||
Value(sb, 2, rowNo, value, TValue);
|
||||
for (var c = 3; c < cols; c++) Blank(sb, c, rowNo, TValue);
|
||||
sb.Append("</row>");
|
||||
merges.Add($"A{rowNo}:B{rowNo}");
|
||||
merges.Add($"C{rowNo}:{last}{rowNo}");
|
||||
rowNo++;
|
||||
}
|
||||
// blank row, then the column captions (height 45)
|
||||
sb.Append("<row r=\"").Append(rowNo).Append("\" ht=\"28.5\" customHeight=\"1\"/>");
|
||||
merges.Add($"A{rowNo}:{last}{rowNo}");
|
||||
rowNo++;
|
||||
sb.Append("<row r=\"").Append(rowNo).Append("\" ht=\"45\" customHeight=\"1\">");
|
||||
for (var c = 0; c < cols; c++) Text(sb, c, rowNo, r.Headers[c], THeader);
|
||||
sb.Append("</row>");
|
||||
rowNo++;
|
||||
foreach (var row in r.Rows)
|
||||
{
|
||||
sb.Append("<row r=\"").Append(rowNo).Append("\" ht=\"24\" customHeight=\"1\">");
|
||||
for (var c = 0; c < cols && c < row.Count; c++) Value(sb, c, rowNo, row[c], TData);
|
||||
sb.Append("</row>");
|
||||
rowNo++;
|
||||
}
|
||||
sb.Append("</sheetData><mergeCells count=\"").Append(merges.Count).Append("\">");
|
||||
foreach (var m in merges) sb.Append("<mergeCell ref=\"").Append(m).Append("\"/>");
|
||||
sb.Append("</mergeCells></worksheet>");
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ shared pieces
|
||||
private static void Col(StringBuilder sb, int c, double width) =>
|
||||
sb.Append("<col min=\"").Append(c + 1).Append("\" max=\"").Append(c + 1).Append("\" width=\"")
|
||||
.Append(width.ToString(CultureInfo.InvariantCulture)).Append("\" customWidth=\"1\"/>");
|
||||
|
||||
private static string Ref(int col, int row) => TabularExport.ColumnName(col) + row.ToString(CultureInfo.InvariantCulture);
|
||||
|
||||
private static void Blank(StringBuilder sb, int col, int row, int style) =>
|
||||
sb.Append("<c r=\"").Append(Ref(col, row)).Append("\" s=\"").Append(style).Append("\"/>");
|
||||
|
||||
private static void Text(StringBuilder sb, int col, int row, string text, int style) =>
|
||||
sb.Append("<c r=\"").Append(Ref(col, row)).Append("\" s=\"").Append(style).Append("\" t=\"inlineStr\"><is><t xml:space=\"preserve\">")
|
||||
.Append(Esc(text)).Append("</t></is></c>");
|
||||
|
||||
private static void Value(StringBuilder sb, int col, int row, object? v, int style)
|
||||
{
|
||||
if (v is null) { Blank(sb, col, row, style); return; }
|
||||
if (v is sbyte or byte or short or ushort or int or uint or long or ulong or float or double or decimal)
|
||||
sb.Append("<c r=\"").Append(Ref(col, row)).Append("\" s=\"").Append(style).Append("\"><v>")
|
||||
.Append(Convert.ToString(v, CultureInfo.InvariantCulture)).Append("</v></c>");
|
||||
else Text(sb, col, row, TabularExport.FormatCell(v), style);
|
||||
}
|
||||
|
||||
/// <summary>Sheet names: at most 31 characters and none of : \ / ? * [ ].</summary>
|
||||
public static string SheetName(string title)
|
||||
{
|
||||
var s = new string(title.Where(ch => ":\\/?*[]".IndexOf(ch) < 0).ToArray()).Trim();
|
||||
if (s.Length == 0) s = "Report";
|
||||
return s.Length > 31 ? s[..31] : s;
|
||||
}
|
||||
|
||||
private static void Add(ZipArchive zip, string name, string content)
|
||||
{
|
||||
var entry = zip.CreateEntry(name, CompressionLevel.Fastest);
|
||||
using var s = entry.Open();
|
||||
var bytes = new UTF8Encoding(false).GetBytes(content);
|
||||
s.Write(bytes, 0, bytes.Length);
|
||||
}
|
||||
|
||||
private static string Esc(string s)
|
||||
{
|
||||
var clean = new StringBuilder(s.Length);
|
||||
foreach (var ch in s)
|
||||
if (ch == '\t' || ch == '\n' || ch == '\r' || ch >= 0x20 && ch != 0xFFFE && ch != 0xFFFF) clean.Append(ch);
|
||||
return SecurityElement.Escape(clean.ToString()) ?? string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,322 +0,0 @@
|
|||
using System.Globalization;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
public interface ITripActionService
|
||||
{
|
||||
Task<TripsResult> FirstAdvanceAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> SecondAdvanceAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> FirstAdvanceReverseAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> SecondAdvanceReverseAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> ExchangeAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> ExchangeAuditAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> ReceiptAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> PaymentAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> ActivateWalletExchangeAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> OrangePaymentAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> CashPaymentAsync(long id, CancellationToken ct);
|
||||
Task<TripsResult> ConfirmExchangeAsync(long id, CancellationToken ct);
|
||||
Task<TripVoucherDto> PrintAsync(long id, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Port of the actions of refinerytripFactory.cfc (diesel card advances and their reversals, receipt / payment / exchange of the wage,
|
||||
/// audit, cash and Orange payments, confirm / activate wallet exchange, print of the cash voucher).
|
||||
/// Role-specific branches of the legacy code are gone: the permission key of each endpoint decides who may act. The status rules the
|
||||
/// legacy STATUS_ACTION_MATRIX enforced per action are kept (WrongStatus = legacy ERROR.NO_AUTHORITY). Mobile push notifications of the
|
||||
/// legacy actions are not sent.
|
||||
/// </summary>
|
||||
public sealed class TripActionService(
|
||||
ITripRepository trips,
|
||||
ITripAmountsService amountsService,
|
||||
IRemainingBalanceService balances,
|
||||
IDinarakGateway dinarak,
|
||||
IDinarakReferenceGateway dinarakReference,
|
||||
IVoucherSerialRepository voucherSerial,
|
||||
IUnitOfWork uow,
|
||||
ICurrentUser user,
|
||||
ITripSettingsService settings) : ITripActionService
|
||||
{
|
||||
private string UserId => user.Id.ToString(CultureInfo.InvariantCulture);
|
||||
private static TripsResult Ok(long id) => new(TripErrors.Ok, id);
|
||||
|
||||
// ------------------------------------------------------------------ helpers
|
||||
private async Task<TripRecord> LoadAsync(long id, CancellationToken ct) =>
|
||||
await trips.GetAsync(id, ct) ?? throw new NotFoundException("RefineryTrip", id);
|
||||
|
||||
/// <summary>Locks the trip row (inside the transaction) and reads it again, so two operators cannot act on the same trip together.</summary>
|
||||
private async Task<TripRecord> LockAndLoadAsync(long id, CancellationToken ct)
|
||||
{
|
||||
if (await trips.LockAsync(id, ct) is null) throw new NotFoundException("RefineryTrip", id);
|
||||
return await LoadAsync(id, ct);
|
||||
}
|
||||
|
||||
private static (bool Exists, object? Value) OldValue(TripRecord t, string key) => key switch
|
||||
{
|
||||
"STATUS_CODE" => (true, t.StatusCode),
|
||||
"REMARKS" => (true, t.Remarks ?? string.Empty),
|
||||
"CURRENT_BALANCE" => (true, t.CurrentBalance),
|
||||
"DINARAK_REFERENCE_ID" => (true, t.DinarakReferenceId),
|
||||
_ => (false, null)
|
||||
};
|
||||
|
||||
/// <summary>REFINERY_TRIPS_LOG row like legacy logs.saveLog (nothing when no argument changed).</summary>
|
||||
private async Task LogAsync(string method, TripRecord old, IReadOnlyDictionary<string, object?> args, CancellationToken ct)
|
||||
{
|
||||
var built = TripLogBuilder.Build(method, k => OldValue(old, k), args);
|
||||
if (built is { } b) await trips.InsertLogAsync(old.Id, method, UserId, b.OldJson, b.NewJson, ct);
|
||||
}
|
||||
|
||||
private static void EnsureStatus(TripRecord t, params string[] allowed)
|
||||
{
|
||||
if (t.StatusCode is null || !allowed.Contains(t.StatusCode)) throw TripErrors.WrongStatus();
|
||||
}
|
||||
|
||||
private static string RequireTn(TripRecord t) => t.Tn ?? throw TripErrors.CardNotFound();
|
||||
|
||||
// ------------------------------------------------------------------ diesel card advances
|
||||
// refinerytripfactory.cfc:215-279 + dao FIRST_ADVANCED_PAYMENT
|
||||
public Task<TripsResult> FirstAdvanceAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
if (t.DieselCharge != 0) throw TripErrors.FirstAdvanceExists();
|
||||
var card = await trips.GetActiveCardAsync(RequireTn(t), c) ?? throw TripErrors.CardNotFound();
|
||||
var calc = await trips.CalculateDieselAsync(id, c) ?? throw TripErrors.PriceNotDeclared();
|
||||
|
||||
await trips.InsertCardLogAsync(card.Id, "FIRST_ADVANCED_PAYMENT", card.CurrentBalance, calc, calc - card.CurrentBalance, UserId, t.Pn ?? string.Empty, c);
|
||||
await trips.MarkFirstAdvanceAsync(id, UserId, c);
|
||||
await trips.UpdateCardBalanceAsync(card.Id, calc, UserId, id, c);
|
||||
await LogAsync("FIRST_ADVANCED_PAYMENT", t, new Dictionary<string, object?> { ["CURRENT_BALANCE"] = calc }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:285-351 + dao SECOND_ADVANCED_PAYMENT
|
||||
public Task<TripsResult> SecondAdvanceAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
if (t.DieselCharge != 1) throw TripErrors.SecondAdvanceExists();
|
||||
var calc = await trips.CalculateDieselAsync(id, c) ?? throw TripErrors.WrongLoadingDate();
|
||||
var card = await trips.GetActiveCardAsync(RequireTn(t), c) ?? throw TripErrors.CardNotFound();
|
||||
|
||||
await trips.InsertCardLogAsync(card.Id, "SECOND_ADVANCED_PAYMENT", card.CurrentBalance, calc, calc - card.CurrentBalance, UserId, t.Pn ?? string.Empty, c);
|
||||
await trips.MarkSecondAdvanceAsync(id, UserId, calc, c);
|
||||
await trips.UpdateCardBalanceAsync(card.Id, calc, UserId, id, c);
|
||||
await LogAsync("SECOND_ADVANCED_PAYMENT", t, new Dictionary<string, object?> { ["CURRENT_BALANCE"] = calc }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:358-412 + dao FIRST_ADVANCED_PAYMENT_REVERSE
|
||||
public Task<TripsResult> FirstAdvanceReverseAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
if (t.DieselCharge == 0) throw TripErrors.FirstAdvanceReverseExists();
|
||||
if (t.DieselCharge != 1) throw TripErrors.CannotReverseAdvance();
|
||||
await ReverseAsync(t, "FIRST_ADVANCED_PAYMENT", "FIRST_ADVANCED_PAYMENT_REVERSE", 0, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:418-477 + dao SECOND_ADVANCED_PAYMENT_REVERSE
|
||||
public Task<TripsResult> SecondAdvanceReverseAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
if (t.DieselCharge == 1) throw TripErrors.SecondAdvanceExists();
|
||||
if (t.DieselCharge != 2) throw TripErrors.CannotReverseAdvance();
|
||||
if (await trips.CalculateDieselAsync(id, c) is null) throw TripErrors.WrongLoadingDate();
|
||||
await ReverseAsync(t, "SECOND_ADVANCED_PAYMENT", "SECOND_ADVANCED_PAYMENT_REVERSE", 1, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
/// <summary>Takes back the amount of the last card log row of the advance: card balance - amount, a negative log row, the trip goes back one step.</summary>
|
||||
private async Task ReverseAsync(TripRecord t, string advanceMethod, string reverseMethod, int newDieselCharge, CancellationToken c)
|
||||
{
|
||||
var card = await trips.GetActiveCardAsync(RequireTn(t), c) ?? throw TripErrors.CardNotFound();
|
||||
var previous = await trips.GetLastCardLogAmountAsync(t.Pn ?? string.Empty, advanceMethod, c) ?? throw TripErrors.CannotReverseAdvance();
|
||||
var balance = card.CurrentBalance - previous;
|
||||
|
||||
await trips.MarkAdvanceReversedAsync(t.Id, UserId, newDieselCharge, c);
|
||||
await trips.InsertCardLogAsync(card.Id, reverseMethod, card.CurrentBalance, balance, -previous, UserId, t.Pn ?? string.Empty, c);
|
||||
await trips.UpdateCardBalanceAsync(card.Id, balance, UserId, t.Id, c);
|
||||
await LogAsync(reverseMethod, t, new Dictionary<string, object?> { ["CURRENT_BALANCE"] = balance }, c);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ wage payment
|
||||
// refinerytripfactory.cfc:494-595 (e-wallet through Dinarak)
|
||||
public async Task<TripsResult> ExchangeAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var t = await LoadAsync(id, ct);
|
||||
EnsureStatus(t, TripStatus.Discharged, TripStatus.PendingExchange);
|
||||
var amounts = await amountsService.ComputeAsync(t, ct);
|
||||
TripPaymentRules.EnsurePayable(amounts.NetWage, settings.Value.MaxPaymentAmount);
|
||||
|
||||
var wallet = await trips.GetActiveWalletByTruckAsync(RequireTn(t), ct);
|
||||
TripPaymentRules.EnsureWalletReady(wallet is not null, wallet?.Epayment, wallet?.WalletNumber, wallet?.OwnerNnpn?.ToString(CultureInfo.InvariantCulture), wallet?.OwnerName);
|
||||
|
||||
// the legacy action stored the figures before it called Dinarak (and they stay when the call fails)
|
||||
await trips.SaveAmountsAsync(id, UserId, amounts, ct);
|
||||
|
||||
// outside any transaction on purpose: the Dinarak log rows must survive a failed payment (legacy kept them too)
|
||||
var res = await dinarak.TransferAsync(id, wallet!.WalletNumber!, wallet.OwnerNnpn!.Value.ToString(CultureInfo.InvariantCulture),
|
||||
amounts.NetWage, wallet.OwnerName!, ct);
|
||||
|
||||
if (!res.Success)
|
||||
{
|
||||
await LogAsync("EXCHANGE", t, new Dictionary<string, object?> { ["REMARKS"] = res.Message }, ct);
|
||||
if (res.Code == "106") throw new BusinessException("DINARAK_DISABLED", "خدمة دينارك غير مفعلة في الإعدادات");
|
||||
throw TripErrors.DinarakRefused(res.Message);
|
||||
}
|
||||
|
||||
return await uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
// the money is already sent: record it whatever the status became meanwhile
|
||||
await trips.MarkExchangedAsync(id, UserId, "SUCCESSFULL_EXCHANGE_OPERATION", null, true, wallet.Id, c);
|
||||
await balances.ResetAfterPaymentAsync(RequireTn(t), id, c);
|
||||
await LogAsync("EXCHANGE", t, new Dictionary<string, object?>
|
||||
{
|
||||
["STATUS_CODE"] = TripStatus.Exchanged, ["REMARKS"] = "SUCCESSFULL_EXCHANGE_OPERATION"
|
||||
}, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
}
|
||||
|
||||
// refinerytripfactory.cfc:598-648
|
||||
public async Task<TripsResult> ReceiptAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var first = await LoadAsync(id, ct);
|
||||
var wallet = await trips.GetActiveWalletByTruckAsync(RequireTn(first), ct);
|
||||
if (wallet is null) throw TripErrors.NoPaymentMethod();
|
||||
if (wallet.Epayment == 1) throw TripErrors.ReloadForm();
|
||||
EnsureStatus(first, TripStatus.Discharged);
|
||||
|
||||
return await uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
EnsureStatus(t, TripStatus.Discharged);
|
||||
var amounts = await amountsService.ComputeAsync(t, c);
|
||||
if (amounts.NetWage == 0) throw TripErrors.PriceNotDeclared();
|
||||
await trips.SetStatusReceivedAsync(id, UserId, TripStatus.ReadyToPay, c);
|
||||
await trips.SaveAmountsAsync(id, UserId, amounts, c);
|
||||
await LogAsync("RECEIPT", t, new Dictionary<string, object?> { ["STATUS_CODE"] = TripStatus.ReadyToPay }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
}
|
||||
|
||||
// refinerytripfactory.cfc:701-734
|
||||
public Task<TripsResult> ExchangeAuditAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
EnsureStatus(t, TripStatus.Discharged);
|
||||
var amounts = await amountsService.ComputeAsync(t, c);
|
||||
if (amounts.NetWage == 0) throw TripErrors.PriceNotDeclared();
|
||||
await trips.SetStatusReceivedAsync(id, UserId, TripStatus.PendingExchange, c);
|
||||
await trips.SaveAmountsAsync(id, UserId, amounts, c);
|
||||
await LogAsync("EXCHANGE_AUDIT", t, new Dictionary<string, object?> { ["STATUS_CODE"] = TripStatus.PendingExchange }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:651-698 (bank transfer paid by the accountant)
|
||||
public Task<TripsResult> PaymentAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
EnsureStatus(t, TripStatus.ReadyToPay);
|
||||
var wallet = await trips.GetActiveWalletByTruckAsync(RequireTn(t), c) ?? throw TripErrors.NoPaymentMethod();
|
||||
var amounts = await amountsService.ComputeAsync(t, c);
|
||||
TripPaymentRules.EnsurePayable(amounts.NetWage, settings.Value.MaxPaymentAmount);
|
||||
|
||||
await trips.MarkExchangedAsync(id, UserId, null, null, false, wallet.Id, c);
|
||||
await trips.SaveAmountsAsync(id, UserId, amounts, c);
|
||||
await balances.ResetAfterPaymentAsync(RequireTn(t), id, c);
|
||||
await LogAsync("PAYMENT", t, new Dictionary<string, object?> { ["STATUS_CODE"] = TripStatus.Exchanged }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:991-1085
|
||||
public Task<TripsResult> CashPaymentAsync(long id, CancellationToken ct) => WalletPaymentAsync(id, "CACH_PAYMENT", resetBalance: true, checkSign: true, ct);
|
||||
|
||||
// refinerytripfactory.cfc:885-965 (no legacy screen can reach it: there is no STATUS_ACTION_MATRIX row; no sign / size check, no balance reset)
|
||||
public Task<TripsResult> OrangePaymentAsync(long id, CancellationToken ct) => WalletPaymentAsync(id, "ORANGE_PAYMENT", resetBalance: false, checkSign: false, ct);
|
||||
|
||||
private Task<TripsResult> WalletPaymentAsync(long id, string method, bool resetBalance, bool checkSign, CancellationToken ct) =>
|
||||
uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LockAndLoadAsync(id, c);
|
||||
var amounts = await amountsService.ComputeAsync(t, c);
|
||||
TripPaymentRules.EnsurePayable(amounts.NetWage, settings.Value.MaxPaymentAmount, checkSign);
|
||||
EnsureStatus(t, TripStatus.Discharged);
|
||||
|
||||
var wallet = await trips.GetActiveWalletByTruckAsync(RequireTn(t), c);
|
||||
TripPaymentRules.EnsureWalletReady(wallet is not null, wallet?.Epayment, wallet?.WalletNumber, wallet?.OwnerNnpn?.ToString(CultureInfo.InvariantCulture), wallet?.OwnerName);
|
||||
|
||||
await trips.SaveAmountsAsync(id, UserId, amounts, c);
|
||||
await trips.MarkExchangedAsync(id, UserId, "SUCCESSFULL_EXCHANGE_OPERATION", method, true, wallet!.Id, c);
|
||||
if (resetBalance) await balances.ResetAfterPaymentAsync(RequireTn(t), id, c);
|
||||
await LogAsync(method, t, new Dictionary<string, object?>
|
||||
{
|
||||
["STATUS_CODE"] = TripStatus.Exchanged, ["REMARKS"] = "SUCCESSFULL_EXCHANGE_OPERATION"
|
||||
}, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
|
||||
// refinerytripfactory.cfc:737-781: asks Dinarak first whether the transfer already went through, then moves the message id by 0.01
|
||||
public async Task<TripsResult> ActivateWalletExchangeAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var t = await LoadAsync(id, ct);
|
||||
EnsureStatus(t, TripStatus.PendingExchange, TripStatus.Discharged);
|
||||
|
||||
if (t.DinarakReferenceId is { } reference)
|
||||
{
|
||||
var status = await dinarakReference.GetTransferByReferenceAsync(reference, ct);
|
||||
if (status.StatusName == "ERROR") throw TripErrors.DinarakStatusUnknown();
|
||||
if (status.Accepted) throw TripErrors.PaymentAlreadySent();
|
||||
}
|
||||
|
||||
return await uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var locked = await LockAndLoadAsync(id, c);
|
||||
var next = await trips.BumpDinarakReferenceAsync(id, UserId, c);
|
||||
await LogAsync("ACTIVATE_WALLET_EXCHANGE", locked, new Dictionary<string, object?> { ["DINARAK_REFERENCE_ID"] = next }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
}
|
||||
|
||||
// refinerytripfactory.cfc:967-984 + dao CONFIRM_EXCHANGE
|
||||
public async Task<TripsResult> ConfirmExchangeAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var t = await LoadAsync(id, ct);
|
||||
EnsureStatus(t, TripStatus.Discharged, TripStatus.PendingExchange);
|
||||
if (!await trips.HasTransferLogAsync(id, ct)) throw TripErrors.NoFailedTransfer();
|
||||
|
||||
return await uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
await LockAndLoadAsync(id, c);
|
||||
await trips.ConfirmExchangeAsync(id, UserId, c);
|
||||
// not in the legacy action (it left the truck balance applied twice); the trip was paid, so the balance is consumed
|
||||
await balances.ResetAfterPaymentAsync(RequireTn(t), id, c);
|
||||
await LogAsync("CONFIRM_EXCHANGE", t, new Dictionary<string, object?> { ["STATUS_CODE"] = TripStatus.Exchanged }, c);
|
||||
return Ok(id);
|
||||
}, ct);
|
||||
}
|
||||
|
||||
// refinerytripfactory.cfc:1112-1243: voucher serial stored on first print, amount from CalculateRefinaryAmount
|
||||
public Task<TripVoucherDto> PrintAsync(long id, CancellationToken ct) => uow.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
var t = await LoadAsync(id, c);
|
||||
EnsureStatus(t, TripStatus.Discharged);
|
||||
|
||||
long serial;
|
||||
if (t.VoucherSerialNumber is { } existing) serial = existing;
|
||||
else
|
||||
{
|
||||
serial = await voucherSerial.NextAsync(c);
|
||||
await trips.SetVoucherSerialAsync(id, serial, c);
|
||||
}
|
||||
var amount = await trips.CalculateAmountAsync(id, c) ?? throw TripErrors.PriceNotDeclared();
|
||||
await LogAsync("PRINT", t, new Dictionary<string, object?> { ["NOTES"] = string.Empty }, c);
|
||||
|
||||
return new TripVoucherDto(id, t.Pn ?? string.Empty, serial.ToString(CultureInfo.InvariantCulture),
|
||||
DateTime.Now.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture), amount, t.DischargeAuthNo, t.OwnerName);
|
||||
}, ct);
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
using NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
public interface ITripAmountsService
|
||||
{
|
||||
/// <summary>Legacy calculateAmounts for a trip record (variables of the loading date, weights, remaining balance of the truck).</summary>
|
||||
Task<TripAmounts> ComputeAsync(TripRecord trip, CancellationToken ct);
|
||||
}
|
||||
|
||||
public sealed class TripAmountsService(ITripRepository trips, IRemainingBalanceRepository balances) : ITripAmountsService
|
||||
{
|
||||
public async Task<TripAmounts> ComputeAsync(TripRecord t, CancellationToken ct)
|
||||
{
|
||||
if (t.LoadingDate is null) return TripAmounts.Zero;
|
||||
var pairs = await trips.GetVariablesAsync(t.LoadingDate.Value.Date, ct);
|
||||
if (pairs.Count == 0) return TripAmounts.Zero;
|
||||
var weights = new TripWeights(t.NetLoadingWeight ?? 0, t.NetDischargeWeight ?? 0, t.WaterAmount ?? 0, await trips.GetWaterFlagAsync(t.Id, ct));
|
||||
decimal? remaining = t.Tn is null ? null : (await balances.GetByTruckAsync(t.Tn, ct))?.RemainingBalance;
|
||||
return TripCalculator.Calculate(weights, TripVariables.FromPairs(pairs), remaining);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
using System.Globalization;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
/// <summary>Variables of REFINERY_VARIABLES valid on a loading date (one value per KEY_NAME; absent key = 0).</summary>
|
||||
public sealed record TripVariables(
|
||||
decimal TonWage,
|
||||
decimal TonPrice,
|
||||
decimal TonPriceCorrection,
|
||||
decimal DriverTip,
|
||||
decimal PermitDispatch,
|
||||
decimal WaybillFee,
|
||||
decimal Commission,
|
||||
decimal TolerancePercentage,
|
||||
decimal FirstAdvancePayment,
|
||||
decimal DieselLiterPrice)
|
||||
{
|
||||
/// <summary>Builds the record from KEY_NAME -> KEY_VALUE pairs (first value of a key wins, like legacy query-of-queries row 1).</summary>
|
||||
public static TripVariables FromPairs(IEnumerable<KeyValuePair<string, string?>> pairs)
|
||||
{
|
||||
var d = new Dictionary<string, decimal>(StringComparer.OrdinalIgnoreCase);
|
||||
foreach (var (k, v) in pairs)
|
||||
if (!d.ContainsKey(k)) d[k] = Parse(v);
|
||||
decimal Get(string k) => d.TryGetValue(k, out var x) ? x : 0m;
|
||||
return new TripVariables(Get("TON_WAGE"), Get("TON_PRICE"), Get("TON_PRICE_CORRECTION"), Get("DRIVER_TIP"),
|
||||
Get("PERMIT_DISPATCH"), Get("WAYBILL_FEE"), Get("COMMISSION"), Get("TOLERANCE_PERCENTAGE"),
|
||||
Get("FIRST_ADVANCE_PAYMENT"), Get("DIESEL_LITER_PRICE"));
|
||||
}
|
||||
|
||||
private static decimal Parse(string? v) =>
|
||||
decimal.TryParse(v?.Trim(), NumberStyles.Number, CultureInfo.InvariantCulture, out var x) ? x : 0m;
|
||||
}
|
||||
|
||||
/// <summary>Weights of a trip that the wage calculation needs.</summary>
|
||||
public sealed record TripWeights(decimal NetLoadingWeight, decimal NetDischargeWeight, decimal WaterAmount, int? WaterFlag);
|
||||
|
||||
/// <summary>Result of the legacy refinerytripFactory.calculateAmounts (all money values rounded to 3 decimals like numberFormat '_.000').</summary>
|
||||
public sealed record TripAmounts(
|
||||
decimal TripNetWage,
|
||||
decimal NetWage,
|
||||
decimal RemainingBalance,
|
||||
decimal PenaltyAmount,
|
||||
decimal PenaltyQuantity,
|
||||
decimal QuantityWage,
|
||||
decimal ToleranceQuantity,
|
||||
decimal TonWage,
|
||||
decimal TonPrice,
|
||||
decimal DriverTip,
|
||||
decimal PermitDispatch,
|
||||
decimal WaybillFee,
|
||||
decimal Commission,
|
||||
decimal TolerancePercentage,
|
||||
decimal FirstAdvancePayment,
|
||||
decimal SecondAdvancePayment,
|
||||
decimal DieselLiterPrice,
|
||||
decimal CalculatedQuantityTon)
|
||||
{
|
||||
/// <summary>No price variables for the loading date: every figure is 0 (legacy returned the zero struct).</summary>
|
||||
public static TripAmounts Zero { get; } = new(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
/// <summary>Pure port of refinerytripFactory.calculateAmounts (refinerytripfactory.cfc:785-881).</summary>
|
||||
public static class TripCalculator
|
||||
{
|
||||
/// <summary>Liters of diesel of a trip (350) priced in the wage deduction (legacy literal).</summary>
|
||||
public const decimal DieselLiters = 350m;
|
||||
|
||||
private static decimal R3(decimal v) => Math.Round(v, 3, MidpointRounding.AwayFromZero);
|
||||
|
||||
/// <param name="useTonPriceCorrection">legacy calculateMode 'TON_PRICE_CORRECTION': penalty priced with TON_PRICE_CORRECTION and the truck's remaining balance is not added.</param>
|
||||
/// <param name="remainingBalance">REFINERY_REMAINING_BALANCE of the truck (null = no row); ignored in correction mode.</param>
|
||||
public static TripAmounts Calculate(TripWeights w, TripVariables v, decimal? remainingBalance, bool useTonPriceCorrection = false)
|
||||
{
|
||||
// ToleranceQuantity = Floor(NET_LOADING_WEIGHT * TOLERANCE_PERCENTAGE)
|
||||
var toleranceQuantity = Math.Floor(w.NetLoadingWeight * v.TolerancePercentage);
|
||||
var water = w.WaterAmount;
|
||||
var allow = toleranceQuantity;
|
||||
|
||||
// water that is not accompanying (flag 1) is ignored and gets no tolerance (factory 816-819)
|
||||
if (w.WaterFlag == 1 && water > 0)
|
||||
{
|
||||
water = 0;
|
||||
allow = 0;
|
||||
}
|
||||
|
||||
var penaltyQuantity = w.NetLoadingWeight - w.NetDischargeWeight - water;
|
||||
var penaltyAmount = 0m;
|
||||
if (penaltyQuantity <= allow)
|
||||
{
|
||||
penaltyQuantity = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
penaltyQuantity = R3(penaltyQuantity - allow);
|
||||
var tonPrice = useTonPriceCorrection ? v.TonPriceCorrection : v.TonPrice;
|
||||
penaltyAmount = R3(penaltyQuantity / 1000m * tonPrice);
|
||||
}
|
||||
|
||||
var calculatedQuantityTon = water >= (w.NetLoadingWeight - w.NetDischargeWeight)
|
||||
? w.NetLoadingWeight / 1000m
|
||||
: (w.NetDischargeWeight + water) / 1000m;
|
||||
|
||||
var quantityWage = R3(calculatedQuantityTon * v.TonWage);
|
||||
var diesel = DieselLiters * v.DieselLiterPrice;
|
||||
var secondAdvance = diesel - v.FirstAdvancePayment;
|
||||
|
||||
var trip = R3(quantityWage - penaltyAmount - v.DriverTip - v.PermitDispatch - v.WaybillFee - diesel - v.Commission);
|
||||
var net = trip;
|
||||
var remaining = 0m;
|
||||
if (!useTonPriceCorrection && remainingBalance.HasValue)
|
||||
{
|
||||
net = trip + remainingBalance.Value;
|
||||
remaining = remainingBalance.Value;
|
||||
}
|
||||
|
||||
return new TripAmounts(
|
||||
TripNetWage: trip,
|
||||
NetWage: R3(net),
|
||||
RemainingBalance: R3(remaining),
|
||||
PenaltyAmount: penaltyAmount,
|
||||
PenaltyQuantity: penaltyQuantity,
|
||||
QuantityWage: quantityWage,
|
||||
ToleranceQuantity: toleranceQuantity,
|
||||
TonWage: R3(v.TonWage),
|
||||
TonPrice: R3(v.TonPrice),
|
||||
DriverTip: R3(v.DriverTip),
|
||||
PermitDispatch: R3(v.PermitDispatch),
|
||||
WaybillFee: R3(v.WaybillFee),
|
||||
Commission: R3(v.Commission),
|
||||
TolerancePercentage: R3(v.TolerancePercentage),
|
||||
FirstAdvancePayment: v.FirstAdvancePayment,
|
||||
SecondAdvancePayment: secondAdvance,
|
||||
DieselLiterPrice: R3(v.DieselLiterPrice),
|
||||
CalculatedQuantityTon: calculatedQuantityTon);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
public interface ITripQueryService
|
||||
{
|
||||
Task<PagedResult<TripGridDto>> SearchAsync(TripQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<TripDetailDto> GetAsync(long id, CancellationToken ct);
|
||||
Task<PagedResult<TripLogDto>> LogAsync(long id, PageRequest page, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>Port of refinerytripFactory.search / getREFINERYTRIP / log (grid, trip form, history popup).</summary>
|
||||
public sealed class TripQueryService(
|
||||
ITripRepository trips,
|
||||
ITripAmountsService amounts) : ITripQueryService
|
||||
{
|
||||
public static void ValidateRanges(TripQuery q)
|
||||
{
|
||||
if (q.LoadingDateFrom > q.LoadingDateTo || q.PaymentedDateFrom > q.PaymentedDateTo) throw TripErrors.FromAfterTo();
|
||||
}
|
||||
|
||||
public async Task<PagedResult<TripGridDto>> SearchAsync(TripQuery query, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
ValidateRanges(query);
|
||||
var r = await trips.SearchAsync(query, page, ct);
|
||||
var items = r.Items.Select(x => new TripGridDto(
|
||||
x.Id, x.Pn, x.DispatchDate, x.LoadingNo, x.DischargeAuthNo, x.DischargeEntryDate, x.Tn, x.Trn, x.Nnpn,
|
||||
x.WageClaimId, x.WageClaimNo, x.StatusCode, x.DieselCharge, x.HavePaymentMethod != "0",
|
||||
(x.WaterAmount ?? 0) != 0, x.ReversePayment == 1, x.NetWage)).ToList();
|
||||
return new PagedResult<TripGridDto>(items, r.Page, r.PageSize, r.TotalCount);
|
||||
}
|
||||
|
||||
public async Task<TripDetailDto> GetAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var t = await trips.GetAsync(id, ct) ?? throw new NotFoundException("RefineryTrip", id);
|
||||
var status = t.StatusCode ?? string.Empty;
|
||||
|
||||
// DISCHARGED / READY_TO_PAY: figures are recomputed from today's variables (factory 129-134)
|
||||
decimal? netWage = t.NetWage, tripNetWage = t.TripNetWage, remaining = t.RemainingBalance;
|
||||
if (TripStatus.RecalculateAmounts.Contains(status) && t.LoadingDate is not null)
|
||||
{
|
||||
var a = await amounts.ComputeAsync(t, ct);
|
||||
netWage = a.NetWage;
|
||||
tripNetWage = a.TripNetWage;
|
||||
remaining = a.RemainingBalance;
|
||||
}
|
||||
|
||||
// CalculateRefinaryDiesel is both the "new balance" and, for the late statuses, the second payment value shown on the form
|
||||
var newBalance = await trips.CalculateDieselAsync(id, ct);
|
||||
var second = TripStatus.ShowSecondPayment.Contains(status) ? newBalance : null;
|
||||
var first = await trips.GetFirstPaymentValueAsync(ct);
|
||||
var audit = await trips.GetAuditModeAsync(ct);
|
||||
|
||||
var wallet = t.Tn is null ? null : await trips.GetActiveWalletByTruckAsync(t.Tn, ct);
|
||||
// a trip that was already paid shows the wallet it was paid to (factory 172-182)
|
||||
if (t.RefineryWalletId is { } wid) wallet = await trips.GetWalletAsync(wid, ct) ?? wallet;
|
||||
var walletDto = wallet is null
|
||||
? new TripWalletDto(null, null, null, null, null, null, null, t.DriverWalletNumber)
|
||||
: new TripWalletDto(wallet.Epayment, wallet.WalletNumber, wallet.OwnerNnpn?.ToString(), wallet.OwnerName,
|
||||
wallet.BankAccount, wallet.Iban, wallet.BankName, t.DriverWalletNumber);
|
||||
|
||||
var hasTransfer = (status is TripStatus.Discharged or TripStatus.PendingExchange) && await trips.HasTransferLogAsync(id, ct);
|
||||
var actions = TripActionRules.Available(status, t.DieselCharge, wallet?.Epayment, audit, hasTransfer);
|
||||
|
||||
return new TripDetailDto(
|
||||
t.Id, t.Pn, t.StatusCode, t.DispatchDate, t.ActualLoadingDate, t.ClientName, t.Tn, t.Trn, t.Nnpn, t.Drvr, t.LoadingNo,
|
||||
t.GrossWeight, t.EmptyWeight, t.NetLoadingWeight, t.LitersWeight, t.DischargeAuthNo, t.DischargeEntryDate,
|
||||
t.ActualGrossWeight, t.ActualEmptyWeight, t.NetDischargeWeight, t.WaterAmount, t.SedimentAmount, t.WeightDifference,
|
||||
netWage, tripNetWage, remaining, t.DieselCharge, t.ReversePayment == 1, t.CardNumber, t.CurrentBalance, newBalance,
|
||||
first, second, t.WageClaimId, t.WageClaimNo, t.Remarks, t.ReceivedByName,
|
||||
t.ReceivedDate?.ToString("yyyy-MM-dd HH:mm"), t.PaymentedDate?.ToString("yyyy-MM-dd HH:mm"), t.PaymentOptions,
|
||||
t.VoucherSerialNumber, audit, walletDto, actions);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<TripLogDto>> LogAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
var r = await trips.SearchLogAsync(id, page, ct);
|
||||
return new PagedResult<TripLogDto>(
|
||||
r.Items.Select(x => new TripLogDto(x.Id, x.MethodName, x.LogDate, x.Login, x.OldData, x.NewData)).ToList(),
|
||||
r.Page, r.PageSize, r.TotalCount);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,218 +0,0 @@
|
|||
using System.Globalization;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
public interface ITripReportService
|
||||
{
|
||||
Task<TripExportFile> TripsAsync(TripQuery query, CancellationToken ct);
|
||||
Task<TripExportFile> OperatorAsync(TripQuery query, CancellationToken ct);
|
||||
Task<TripExportFile> ExchangeAsync(TripQuery query, CancellationToken ct);
|
||||
Task<TripExportFile> DieselAsync(DieselReportQuery query, CancellationToken ct);
|
||||
Task<TripExportFile> CardsAsync(string? tn, CancellationToken ct);
|
||||
Task<TripExportFile> BankAsync(BankReportQuery query, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Excel reports of the trips screen: trips (factoryweb.report, manager column set), diesel card movements (REFINERY_DIESEL_REPORT_VIEW),
|
||||
/// diesel balances of the cards (refineryCardsReport) and the bank report (refineryBankReport; its layout lives in a binary ColdFusion
|
||||
/// report template that cannot be read, so the columns here are a reasonable set, see the module notes).
|
||||
/// </summary>
|
||||
public sealed class TripReportService(ITripRepository trips) : ITripReportService
|
||||
{
|
||||
private static string Stamp => DateTime.Now.ToString("yyyyMMdd-HHmmss", CultureInfo.InvariantCulture);
|
||||
|
||||
private static TripExportFile Xlsx(string name, ExportTable table) =>
|
||||
new(TabularExport.ToXlsx([table], rightToLeft: true), $"{name}-{Stamp}.xlsx", TabularExport.XlsxContentType);
|
||||
|
||||
private static string Day(DateTime? d) => d?.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture) ?? string.Empty;
|
||||
|
||||
// ---- legacy report layout (aqabaTCSBCommon.report.create): the trips, exchange and diesel-balance reports use it
|
||||
private const string CompanyName = "شركة نافذ للخدمات اللوجستية"; // caption PUBLIC.NAFITH_NAME
|
||||
private const string TripsTitle = "شاشة الارساليات"; // caption MENU.REFINERYTRIPS
|
||||
private const string CardsTitle = "أرصدة الديزل"; // caption PUBLIC.CARD_REPORT
|
||||
|
||||
// column widths in points, as set in the legacy factory: report() manager set (650-820), refineryCardsReport (559-576)
|
||||
private static readonly int[] TripsWidths =
|
||||
[100, 150, 150, 150, 200, 200, 200, 200, 150, 150, 150, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 220, 200, 200, 200, 200, 200, 200, 200, 150];
|
||||
private static readonly int[] CardsWidths = [100, 150, 150, 150];
|
||||
|
||||
private static TripExportFile Legacy(
|
||||
string name, string title, IReadOnlyList<(string Label, string Value)> filters, string[] headers, int[] widths,
|
||||
IReadOnlyList<IReadOnlyList<object?>> data) =>
|
||||
new(LegacyReportWorkbook.ToXlsx(new LegacyReport(CompanyName, title, filters, headers, widths, data)),
|
||||
$"{name}-{Stamp}.xlsx", TabularExport.XlsxContentType);
|
||||
|
||||
/// <summary>The filters row of the legacy report: the text filters in a fixed order (status shown with its caption), then the dates, oldest first.</summary>
|
||||
public static IReadOnlyList<(string Label, string Value)> Filters(TripQuery q)
|
||||
{
|
||||
var f = new List<(string Label, string Value)>();
|
||||
void Add(string label, string? v) { if (!string.IsNullOrWhiteSpace(v)) f.Add((label, v.Trim())); }
|
||||
Add("رقم الارسالية", q.Pn);
|
||||
Add("رقم القاطرة", q.Tn);
|
||||
Add("رقم المقطورة", q.Trn);
|
||||
Add("الرقم الوطني", q.Nnpn);
|
||||
Add("رقم الحمولة", q.LoadingNo);
|
||||
Add("رقم النموذج", q.DischargeAuthNo);
|
||||
if (!string.IsNullOrWhiteSpace(q.StatusCode))
|
||||
f.Add(("الحالة", string.Join("،", q.StatusCode.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
|
||||
.Select(s => s.Trim('\'')).Select(s => TripStatus.Captions.GetValueOrDefault(s, s)))));
|
||||
Add("رقم مطالبة اجور النقل", q.WageClaimNo);
|
||||
Add("رقم الحساب", q.BankAccount);
|
||||
var dates = new List<(DateTime Value, string Label)>();
|
||||
void AddDate(string label, DateTime? d) { if (d is not null) dates.Add((d.Value, label)); }
|
||||
AddDate("تاريخ الارسالية", q.DispatchDate);
|
||||
AddDate("تاريخ النموذج", q.DischargeEntryDate);
|
||||
AddDate("من تاريخ التحميل", q.LoadingDateFrom);
|
||||
AddDate("الى تاريخ التحميل", q.LoadingDateTo);
|
||||
AddDate("من تاريخ الدفع", q.PaymentedDateFrom);
|
||||
AddDate("الى تاريخ الدفع", q.PaymentedDateTo);
|
||||
foreach (var (value, label) in dates.OrderBy(d => d.Value)) f.Add((label, Day(value)));
|
||||
return f;
|
||||
}
|
||||
|
||||
public async Task<TripExportFile> TripsAsync(TripQuery query, CancellationToken ct)
|
||||
{
|
||||
TripQueryService.ValidateRanges(query);
|
||||
var rows = await trips.ReportAsync(query, ct);
|
||||
|
||||
var data = new List<IReadOnlyList<object?>>();
|
||||
var n = 0;
|
||||
foreach (var r in rows)
|
||||
{
|
||||
// NEW_TOTAL_VALUE: balance after the next diesel payment; from the 3rd step on it is just the balance
|
||||
decimal? newTotal = r.DieselCharge >= 2 ? r.CurrentBalance : await trips.CalculateDieselAsync(r.Id, ct);
|
||||
|
||||
// factoryweb.report 624-639: payment method text as the accountant reads it
|
||||
var paid = string.IsNullOrEmpty(r.PaidEpayment) ? r.PaymentMethod : r.PaidEpayment;
|
||||
string? bankName = r.BankName, iban = r.Iban, account = r.BankAccount, wallet = r.WalletNumber;
|
||||
var paidText = paid?.Trim();
|
||||
if (paidText == "الكتروني")
|
||||
{
|
||||
if (r.PaymentOptions?.Trim() == "CACH_PAYMENT") paid = "دفع نقدي";
|
||||
bankName = iban = account = string.Empty;
|
||||
}
|
||||
else if (paidText == "حوالة") wallet = string.Empty;
|
||||
|
||||
data.Add([
|
||||
++n, r.Pn, r.DispatchDate, r.LoadingNo, r.DischargeAuthNo, r.DischargeEntryDate, r.NetLoadingWeight, r.NetDischargeWeight,
|
||||
r.Tn, r.Trn, r.Nnpn, r.CurrentBalance, newTotal, r.NetWage, r.TripNetWage, r.RemainingBalance,
|
||||
TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty), r.WageClaimNo,
|
||||
Day(r.PaymentedDate), Day(r.ReceivedDate), r.ReceivedByName, r.ActualLoadingDate, paid, r.OwnerName, r.OwnerNameEnglish,
|
||||
bankName, iban, account, wallet, r.OwnerNnpn
|
||||
]);
|
||||
}
|
||||
|
||||
string[] headers =
|
||||
[
|
||||
"متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي(كغ)",
|
||||
"الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "الرقم الوطني", "القيمة التراكمية الحالية", "القيمة التراكمية الجديدة",
|
||||
"صافي قيمة الصرف الفعلي", "قيمة اجور النقل", "قيمة الذمم السابقة", "الحالة", "رقم مطالبة اجور النقل", "تاريخ الدفع",
|
||||
"تاريخ الاستلام", "اسم المستلم", "تاريخ التحميل", "آلية الصرف", "صاحب الحساب", "صاحب الحساب بالانجليزي", "البنك", "IBAN",
|
||||
"رقم الحساب", "رقم المحفظة", "رقم هوية المالك"
|
||||
];
|
||||
return Legacy("refinery-trips", TripsTitle, Filters(query), headers, TripsWidths, data);
|
||||
}
|
||||
|
||||
/// <summary>factoryweb.report, REFINERY_OP column set (lines 825-870): form no., truck, net wage, paid / received dates and receiver.
|
||||
/// The legacy limit to the trips the user received himself is a role rule and is not ported.</summary>
|
||||
public async Task<TripExportFile> OperatorAsync(TripQuery query, CancellationToken ct)
|
||||
{
|
||||
TripQueryService.ValidateRanges(query);
|
||||
var rows = await trips.ReportAsync(query, ct);
|
||||
var data = rows.Select((r, i) => (IReadOnlyList<object?>)
|
||||
[i + 1, r.DischargeAuthNo, r.Tn, r.NetWage, Day(r.PaymentedDate), Day(r.ReceivedDate), r.ReceivedByName]).ToList();
|
||||
string[] headers = ["متسلسل", "رقم النموذج", "رقم القاطرة", "صافي قيمة الصرف الفعلي", "تاريخ الدفع", "تاريخ الاستلام", "اسم المستلم"];
|
||||
return Xlsx("refinery-trips-operator", new ExportTable(["شاشة الارساليات"], headers, data));
|
||||
}
|
||||
|
||||
// legacy الحوالات list (companyreport.cfr output): title and column widths in characters, as in the legacy sample files
|
||||
private const string TransfersTitle = "قائمة ارقام نماذج التفريغ المعدة لصرف أجور النقل";
|
||||
private static readonly double[] TransfersWidths = [9.14, 10.86, 16.71, 12.29, 12.71, 24.86, 12.29, 13.57, 13.71, 11.43, 15.43, 15.43, 24.29];
|
||||
|
||||
/// <summary>
|
||||
/// الحوالات (legacy refineryBankReport, layout of companyreport.cfr): the discharge forms prepared for payment by bank transfer to ONE account.
|
||||
/// The bank account is required (ERROR.NO_BANK_ACCOUNT); the other filters are the legacy ones: status, wage-claim flag and payment dates.
|
||||
/// The sheet shows the account block (owner, English name, bank, account number, IBAN, total net wage) and then the trips table.
|
||||
/// </summary>
|
||||
public async Task<TripExportFile> ExchangeAsync(TripQuery query, CancellationToken ct)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(query.BankAccount)) throw TripErrors.NoBankAccount();
|
||||
if (query.PaymentedDateFrom > query.PaymentedDateTo) throw TripErrors.FromAfterTo();
|
||||
var q = new TripQuery(
|
||||
BankAccount: query.BankAccount, StatusCode: query.StatusCode, HasWageClaim: query.HasWageClaim,
|
||||
PaymentedDateFrom: query.PaymentedDateFrom, PaymentedDateTo: query.PaymentedDateTo);
|
||||
var rows = await trips.ReportAsync(q, ct);
|
||||
|
||||
var first = rows.FirstOrDefault();
|
||||
var total = Math.Round(rows.Sum(r => r.NetWage ?? 0m), 3);
|
||||
IReadOnlyList<(string Label, object? Value)> info =
|
||||
[
|
||||
("صاحب الحساب", first?.OwnerName),
|
||||
("الاسم بالانجليزي", first?.OwnerNameEnglish),
|
||||
("اسم البنك", first?.BankName),
|
||||
("رقم الحساب", first?.BankAccount ?? query.BankAccount.Trim()),
|
||||
("IBAN", first?.Iban),
|
||||
("صافي قيمة اجور النقل", total)
|
||||
];
|
||||
var data = rows.Select((r, i) => (IReadOnlyList<object?>)
|
||||
[
|
||||
i + 1, r.Pn, r.DispatchDate, r.LoadingNo, r.DischargeAuthNo, r.DischargeEntryDate, r.NetLoadingWeight, r.NetDischargeWeight,
|
||||
r.Tn, r.Trn, r.NetWage, TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty),
|
||||
r.ReceivedDate?.ToString("dd/MM/yyyy HH:mm", CultureInfo.InvariantCulture)
|
||||
]).ToList();
|
||||
string[] headers =
|
||||
[
|
||||
"متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي للتحميل (كغ)",
|
||||
"الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "صافي قيمة اجور النقل", "الحالة", "تاريخ الاستلام"
|
||||
];
|
||||
return new(
|
||||
LegacyReportWorkbook.ToTransfersXlsx(new TransfersReport(CompanyName, TransfersTitle, info, headers, TransfersWidths, data)),
|
||||
$"refinery-transfers-{Stamp}.xlsx", TabularExport.XlsxContentType);
|
||||
}
|
||||
|
||||
public async Task<TripExportFile> DieselAsync(DieselReportQuery query, CancellationToken ct)
|
||||
{
|
||||
if (query.DateFrom > query.DateTo) throw TripErrors.FromAfterTo();
|
||||
var rows = await trips.DieselReportAsync(query, ct);
|
||||
var data = rows.Select((r, i) => (IReadOnlyList<object?>)
|
||||
[
|
||||
i + 1, r.Pn, r.DischargeAuthNo, r.Tn, r.MethodName, r.BalanceBefore, r.BalanceAfter, r.Amount,
|
||||
r.CreationDate?.ToString("dd/MM/yyyy HH:mm", CultureInfo.InvariantCulture), r.FirstName,
|
||||
TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty)
|
||||
]).ToList();
|
||||
string[] headers =
|
||||
[
|
||||
"متسلسل", "رقم الارسالية", "رقم النموذج", "رقم القاطرة", "نوع الحركة", "الرصيد قبل", "الرصيد بعد", "القيمة",
|
||||
"تاريخ ووقت الحركة", "اسم المستخدم", "الحالة"
|
||||
];
|
||||
return Xlsx("refinery-diesel", new ExportTable(["شحن الديزل"], headers, data));
|
||||
}
|
||||
|
||||
public async Task<TripExportFile> CardsAsync(string? tn, CancellationToken ct)
|
||||
{
|
||||
var rows = await trips.CardsAsync(string.IsNullOrWhiteSpace(tn) ? null : tn.Trim(), ct);
|
||||
var data = rows.Select((r, i) => (IReadOnlyList<object?>)[i + 1, r.Tn, r.CardNumber, r.CurrentBalance]).ToList();
|
||||
string[] headers = ["متسلسل", "رقم القاطرة", "رقم بطاقة جوبترول", "القيمة التراكمية الحالية"];
|
||||
var filters = string.IsNullOrWhiteSpace(tn) ? [] : new List<(string Label, string Value)> { ("رقم القاطرة", tn.Trim()) };
|
||||
return Legacy("refinery-cards", CardsTitle, filters, headers, CardsWidths, data);
|
||||
}
|
||||
|
||||
public async Task<TripExportFile> BankAsync(BankReportQuery query, CancellationToken ct)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(query.BankAccount)) throw TripErrors.NoBankAccount();
|
||||
if (query.PaymentedDateFrom > query.PaymentedDateTo) throw TripErrors.FromAfterTo();
|
||||
var rows = await trips.BankReportAsync(query, ct);
|
||||
var data = rows.Select((r, i) => (IReadOnlyList<object?>)
|
||||
[
|
||||
i + 1, r.Pn, r.DischargeAuthNo, r.Tn, r.OwnerName, r.BankName, r.Iban, r.BankAccount, r.NetWage,
|
||||
Day(r.PaymentedDate), TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty)
|
||||
]).ToList();
|
||||
string[] headers =
|
||||
[
|
||||
"متسلسل", "رقم الارسالية", "رقم النموذج", "رقم القاطرة", "صاحب الحساب", "البنك", "IBAN", "رقم الحساب",
|
||||
"صافي قيمة الصرف الفعلي", "تاريخ الدفع", "الحالة"
|
||||
];
|
||||
return Xlsx("refinery-bank", new ExportTable(["عطاء صرف نماذج النفط الخام"], headers, data));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,253 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Text.Json;
|
||||
using NTP.Application.Common;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
/// <summary>REFINERY_TRIPS.STATUS_CODE values used by the trip actions.</summary>
|
||||
public static class TripStatus
|
||||
{
|
||||
public const string Released = "RESD";
|
||||
public const string Loaded = "LOADED";
|
||||
public const string Discharged = "DISCHARGED";
|
||||
public const string PendingExchange = "PENDING_EXCHANGE";
|
||||
public const string ReadyToPay = "READY_TO_PAY";
|
||||
public const string Exchanged = "EXCHANGED";
|
||||
public const string Revoked = "RVKD";
|
||||
|
||||
/// <summary>Arabic captions REFINERYTRIP.STATUS.* / REFINERYTRIP.STATUSCODE.* (ntp.lt_caption).</summary>
|
||||
public static readonly IReadOnlyDictionary<string, string> Captions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
["RESD"] = "تم التسريب",
|
||||
["LOADING_FILL"] = "تم التعبئة للتحميل",
|
||||
["LOADED"] = "تم التحميل",
|
||||
["DISCHARGING_FILL"] = "تم التعبئة للتفريغ",
|
||||
["ARRIVE_LOCATION"] = "وصول شويعر",
|
||||
["DISCHARGING"] = "قيد التفريغ",
|
||||
["DISCHARGED"] = "تم التفريغ",
|
||||
["PENDING_EXCHANGE"] = "قيد التدقيق للصرف",
|
||||
["READY_TO_PAY"] = "جاهز للدفع",
|
||||
["EXCHANGED"] = "تم الصرف",
|
||||
["COMPLETE"] = "مكتمل",
|
||||
["RVKD"] = "ملغى",
|
||||
};
|
||||
|
||||
/// <summary>The statuses in which the second advance value is shown on the trip form (factory getREFINERYTRIP 138).</summary>
|
||||
public static readonly string[] ShowSecondPayment =
|
||||
["LOADED", "DISCHARGING_FILL", "ARRIVE_LOCATION", "EXCHANGED", "DISCHARGING", "DISCHARGED", "READY_TO_PAY"];
|
||||
|
||||
/// <summary>Statuses for which getREFINERYTRIP recomputes the wage figures (factory 129).</summary>
|
||||
public static readonly string[] RecalculateAmounts = ["DISCHARGED", "READY_TO_PAY"];
|
||||
|
||||
/// <summary>calculateRemainigBalance refuses to run while a trip of the period is in one of these (factory 1289).</summary>
|
||||
public static readonly string[] BlockRepricing = ["READY_TO_PAY", "PENDING_EXCHANGE", "DISCHARGING", "LOADED", "RESD", "ARRIVE_LOCATION"];
|
||||
}
|
||||
|
||||
/// <summary>Legacy captions (ntp.lt_caption) of the refinery trip messages, kept verbatim. Codes without a caption in the database are marked.</summary>
|
||||
public static class TripErrors
|
||||
{
|
||||
public const string Ok = "تمت العملية بنجاح"; // PUBLIC.SUCCESSFUL.OPERATION
|
||||
|
||||
public static BusinessException FirstAdvanceExists() =>
|
||||
new("FIRST_ADVANCED_PAYMENT_IS_EXIST", "تم اجراء دفعة الديزل الاولى مسبقاً");
|
||||
|
||||
/// <summary>
|
||||
/// Caption ERROR.SECOND_ADVANCED_PAYMENT_IS_EXIST of the database reads "لا يوجد بطاقة ديزل معرفة" (copy/paste slip in the legacy table);
|
||||
/// the plain code SECOND_ADVANCED_PAYMENT_IS_EXIST carries the meaning the legacy code intended, which is used here.
|
||||
/// </summary>
|
||||
public static BusinessException SecondAdvanceExists() =>
|
||||
new("SECOND_ADVANCED_PAYMENT_IS_EXIST", "تم اجراء دفعة الديزل الثانية مسبقاً");
|
||||
|
||||
/// <summary>No caption exists for FIRST_ADVANCED_PAYMENT_REVERSE_IS_EXIST in the legacy database; wording is new.</summary>
|
||||
public static BusinessException FirstAdvanceReverseExists() =>
|
||||
new("FIRST_ADVANCED_PAYMENT_REVERSE_IS_EXIST", "تم إلغاء دفعة الديزل الأولى مسبقاً");
|
||||
|
||||
/// <summary>No caption exists for CANNOT_FIRST_ADVANCED_PAYMENT_REVERSE in the legacy database; wording is new.</summary>
|
||||
public static BusinessException CannotReverseAdvance() =>
|
||||
new("CANNOT_FIRST_ADVANCED_PAYMENT_REVERSE", "لا يمكن إلغاء دفعة الديزل");
|
||||
|
||||
public static BusinessException CardNotFound() =>
|
||||
new("THE_REFINERY_CARD_IS_NOT_EXIST", "بطاقة تعبئة الديزل غير معرفة");
|
||||
|
||||
public static BusinessException WrongLoadingDate() =>
|
||||
new("WRONG_LOADING_DATE", "السعر غير معرف لتاريخ التحميل");
|
||||
|
||||
/// <summary>Legacy code ERROR.REFINERY_PRICE_IS_NOT_DECALRE_FOR_THIS_PERIOD resolves to the plain caption of the same name.</summary>
|
||||
public static BusinessException PriceNotDeclared() =>
|
||||
new("REFINERY_PRICE_IS_NOT_DECALRE_FOR_THIS_PERIOD", "السعر غير معرف لتاريخ التحميل");
|
||||
|
||||
public static BusinessException NegativeAmount() =>
|
||||
new("PAYMENT_ISNOT_ALLOW_FOR_MINUS_AMOUNT", "الدفع مسموح للمبالغ اكبر من صفر");
|
||||
|
||||
public static BusinessException BigAmount(decimal max) =>
|
||||
new("PAYMENT_ISNOT_ALLOW_FOR_BIG_AMOUNT",
|
||||
"الدفع مسموح فقط للمبالغ اقل من " + max.ToString("0.###", CultureInfo.InvariantCulture) + " دينار");
|
||||
|
||||
public static BusinessException NoPaymentMethod() =>
|
||||
new("CANNOT_COMPLETE_ACTION_NO_PAYMENT_METHOD", "لا يمكن استكمال الاجراء بدون تحديد طريقه الدفع");
|
||||
|
||||
public static BusinessException ReloadForm() =>
|
||||
new("THERE_IS_EWALLET_PLEASE_RELOAD_FORM", "لا يمكن استكمال الاجراء ، يرجى اغلاق نموذج الارسالية واعاده فتحة مرة اخرى");
|
||||
|
||||
public static BusinessException WalletNumberEmpty() =>
|
||||
new("WALLET_NUMBER_IS_EMPTY", "لا يوجد رقم محفظة الكترونية");
|
||||
|
||||
public static BusinessException OwnerNnpnEmpty() =>
|
||||
new("OWNER_NNPN_IS_EMPTY", "لا يوجد رقم وطني لصاحب المحفظة الالكترونية لغاية الدفع");
|
||||
|
||||
public static BusinessException OwnerNameEmpty() =>
|
||||
new("REFINERY_OWNER_NNPN_WALLET_IS_EMPTY", "لا يوجد اسم لصاحب المحفظة الالكترونية لغاية الدفع");
|
||||
|
||||
/// <summary>Legacy answered ERROR.NO_AUTHORITY when the trip was not in a status the action allows from.</summary>
|
||||
public static BusinessException WrongStatus() =>
|
||||
new("NO_AUTHORITY", "ليس لديك صلاحية لاتمام هذه العملية");
|
||||
|
||||
public static BusinessException PaymentAlreadySent() =>
|
||||
new("PAYMENT_ALREADY_SENT", "لايمكن تفعيل الصرف, تم الصرف مسبقا");
|
||||
|
||||
/// <summary>No caption exists for ERROR_BACK_FROM_DINARAK in the legacy database; wording is new (legacy appended the Dinarak text after it).</summary>
|
||||
public static BusinessException DinarakRefused(string dinarakMessage) =>
|
||||
new("ERROR_BACK_FROM_DINARAK", "تعذر إتمام الحوالة عبر دينارك" + "\n" + dinarakMessage.ToUpperInvariant());
|
||||
|
||||
/// <summary>No caption exists for REFINERY_NO_FAILED_TRANSFER in the legacy database; wording is new.</summary>
|
||||
public static BusinessException NoFailedTransfer() =>
|
||||
new("REFINERY_NO_FAILED_TRANSFER", "لا توجد حوالة مسجلة لهذه الارسالية");
|
||||
|
||||
/// <summary>New: legacy continued when the Dinarak status lookup failed (risk of paying twice); this port refuses.</summary>
|
||||
public static BusinessException DinarakStatusUnknown() =>
|
||||
new("DINARAK_STATUS_UNKNOWN", "تعذر التحقق من حالة الحوالة لدى دينارك، حاول لاحقاً");
|
||||
|
||||
public static BusinessException NoTripsInPeriod() =>
|
||||
new("THERE_IS_NO_ANY_TRIP_IN_THIS_PERIOD", "لا يوجد ارساليات ضمن هذه الفترة");
|
||||
|
||||
public static BusinessException NotAllExchanged() =>
|
||||
new("NO_TON_PRICE_EDIT_NOT_ALL_TRIPS_EXCHANGED", "لا يمكن اعادة تسعير سعر النفط ، يجب ان تكون جميع الارساليات ضمن الفترة مسددة");
|
||||
|
||||
public static BusinessException FromAfterTo() =>
|
||||
new("FROM_CAN_NOT_GREATER_THAN_TO", "لا يجوز ان يكون تاريخ من أكبر من تارخ الى");
|
||||
|
||||
public static BusinessException NoBankAccount() =>
|
||||
new("NO_BANK_ACCOUNT", "يجب ادخال رقم الحساب");
|
||||
}
|
||||
|
||||
/// <summary>Rules shared by the payment actions (refinerytripfactory.cfc exchange / PAYMENT / CACH_PAYMENT).</summary>
|
||||
public static class TripPaymentRules
|
||||
{
|
||||
/// <summary>
|
||||
/// 0 = no price for the loading date, negative = nothing to pay, above <paramref name="max"/> = too big
|
||||
/// (legacy application.REFINERY_MAX_PAYMENT_AMOUNT, caption says 500 dinars). <paramref name="checkSign"/> false = ORANGE_PAYMENT (zero check only).
|
||||
/// </summary>
|
||||
public static void EnsurePayable(decimal netWage, decimal max, bool checkSign = true)
|
||||
{
|
||||
if (netWage == 0) throw TripErrors.PriceNotDeclared();
|
||||
if (!checkSign) return;
|
||||
if (netWage < 0) throw TripErrors.NegativeAmount();
|
||||
if (netWage > max) throw TripErrors.BigAmount(max);
|
||||
}
|
||||
|
||||
/// <summary>Wallet checks before a wallet payment (exchange / cash / orange): <paramref name="epayment"/> must be 1.</summary>
|
||||
public static void EnsureWalletReady(bool walletExists, int? epayment, string? walletNumber, string? ownerNnpn, string? ownerName)
|
||||
{
|
||||
if (!walletExists) throw TripErrors.NoPaymentMethod();
|
||||
if (epayment == 0) throw TripErrors.ReloadForm();
|
||||
if (string.IsNullOrEmpty(walletNumber)) throw TripErrors.WalletNumberEmpty();
|
||||
if (string.IsNullOrEmpty(ownerNnpn)) throw TripErrors.OwnerNnpnEmpty();
|
||||
if (string.IsNullOrEmpty(ownerName)) throw TripErrors.OwnerNameEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Builds the OLD_DATA / NEW_DATA JSON of REFINERY_TRIPS_LOG like legacy logs.saveLog: only the fields passed as arguments that exist on the
|
||||
/// trip record and whose value changed; STATUS_CODE and REMARKS are stored as Arabic captions. PRINT stores the arguments as they are.
|
||||
/// </summary>
|
||||
public static class TripLogBuilder
|
||||
{
|
||||
private static readonly JsonSerializerOptions Json = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
|
||||
|
||||
public static string? RemarksCaption(string? code) => code switch
|
||||
{
|
||||
"SUCCESSFULL_EXCHANGE_OPERATION" => "تمت عملية الصرف بنجاح", // caption SUCCESSFULL_EXCHANGE_OPERATION
|
||||
_ => code
|
||||
};
|
||||
|
||||
private static string Caption(string key, object? v)
|
||||
{
|
||||
var s = Text(v);
|
||||
return key switch
|
||||
{
|
||||
"STATUS_CODE" => TripStatus.Captions.TryGetValue(s, out var c) ? c : s,
|
||||
"REMARKS" => RemarksCaption(s) ?? string.Empty,
|
||||
_ => s
|
||||
};
|
||||
}
|
||||
|
||||
private static string Text(object? v) => v switch
|
||||
{
|
||||
null => string.Empty,
|
||||
decimal d => d.ToString("0.#########", CultureInfo.InvariantCulture),
|
||||
IFormattable f => f.ToString(null, CultureInfo.InvariantCulture),
|
||||
_ => v.ToString() ?? string.Empty
|
||||
};
|
||||
|
||||
private static bool Same(object? a, object? b)
|
||||
{
|
||||
if (decimal.TryParse(Text(a), NumberStyles.Any, CultureInfo.InvariantCulture, out var x) &&
|
||||
decimal.TryParse(Text(b), NumberStyles.Any, CultureInfo.InvariantCulture, out var y)) return x == y;
|
||||
return string.Equals(Text(a), Text(b), StringComparison.Ordinal);
|
||||
}
|
||||
|
||||
/// <param name="oldValue">Current value of a trip column (view column name, upper case) or null when the record has no such column.</param>
|
||||
/// <param name="args">New values by upper-case column name.</param>
|
||||
public static (string OldJson, string NewJson)? Build(string methodName, Func<string, (bool Exists, object? Value)> oldValue,
|
||||
IReadOnlyDictionary<string, object?> args)
|
||||
{
|
||||
if (methodName.Equals("PRINT", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var all = args.ToDictionary(a => a.Key, a => Text(a.Value));
|
||||
return all.Count == 0 ? null : ("{}", JsonSerializer.Serialize(all, Json));
|
||||
}
|
||||
|
||||
var oldD = new Dictionary<string, string>();
|
||||
var newD = new Dictionary<string, string>();
|
||||
foreach (var (key, value) in args)
|
||||
{
|
||||
var (exists, old) = oldValue(key);
|
||||
if (!exists || Same(old, value)) continue;
|
||||
oldD[key] = Caption(key, old);
|
||||
newD[key] = Caption(key, value);
|
||||
}
|
||||
return newD.Count == 0 ? null : (JsonSerializer.Serialize(oldD, Json), JsonSerializer.Serialize(newD, Json));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Which action buttons the trip form offers (legacy getREFINERYTRIP ACTIONS / REVERSE_ACTIONS + REFINERYTRIP.js status switch). The caller still needs the permission key.</summary>
|
||||
public static class TripActionRules
|
||||
{
|
||||
public static IReadOnlyList<string> Available(string status, int dieselCharge, int? epayment, bool auditMode, bool hasTransferLog)
|
||||
{
|
||||
var list = new List<string>();
|
||||
if (dieselCharge == 0 && status != TripStatus.Revoked) list.Add("firstAdvance");
|
||||
if (dieselCharge == 1 && status != TripStatus.Released) list.Add("secondAdvance");
|
||||
if (dieselCharge == 1) list.Add("firstAdvanceReverse");
|
||||
if (dieselCharge == 2) list.Add("secondAdvanceReverse");
|
||||
|
||||
if (status == TripStatus.Discharged)
|
||||
{
|
||||
if (epayment == 1)
|
||||
{
|
||||
list.Add(auditMode ? "exchangeAudit" : "exchange");
|
||||
list.Add("cashPayment");
|
||||
}
|
||||
else list.Add("receipt");
|
||||
list.Add("print");
|
||||
}
|
||||
if (status == TripStatus.PendingExchange && epayment == 1) list.Add("exchange");
|
||||
if ((status is TripStatus.Discharged or TripStatus.PendingExchange) && epayment == 1)
|
||||
{
|
||||
list.Add("activateWalletExchange");
|
||||
if (hasTransferLog) list.Add("confirmExchange");
|
||||
}
|
||||
if (status == TripStatus.ReadyToPay) list.Add("payment");
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,272 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
/// <summary>Envelope of write operations: <c>message</c> is the legacy Arabic success text (toasted by the client).</summary>
|
||||
public sealed record TripsResult(string Message, long? Id = null);
|
||||
|
||||
// ---------------------------------------------------------------- filters
|
||||
/// <summary>
|
||||
/// Grid / report filters (legacy factoryweb.search whitelist, mapped on REFINERY_TRIPS_VIEW). <c>StatusCode</c> and
|
||||
/// <c>PaymentMethodCode</c> accept a comma separated list (multi-select). Dates are days (yyyy-MM-dd).
|
||||
/// </summary>
|
||||
public sealed record TripQuery(
|
||||
string? Pn = null,
|
||||
string? Tn = null,
|
||||
string? Trn = null,
|
||||
string? Nnpn = null,
|
||||
string? LoadingNo = null,
|
||||
string? DischargeAuthNo = null,
|
||||
DateTime? DispatchDate = null,
|
||||
DateTime? DischargeEntryDate = null,
|
||||
DateTime? LoadingDateFrom = null,
|
||||
DateTime? LoadingDateTo = null,
|
||||
DateTime? PaymentedDateFrom = null,
|
||||
DateTime? PaymentedDateTo = null,
|
||||
string? StatusCode = null,
|
||||
string? PaymentMethodCode = null,
|
||||
string? HasWageClaim = null,
|
||||
string? HavePaymentMethod = null,
|
||||
string? DieselCharge = null,
|
||||
string? WageClaimNo = null,
|
||||
long? WageClaimId = null,
|
||||
string? BankAccount = null,
|
||||
string? WaterExist = null,
|
||||
long? Id = null);
|
||||
|
||||
// ---------------------------------------------------------------- grid
|
||||
/// <summary>One grid row. The icons of the legacy action column derive from DieselCharge / HavePaymentMethod / WaterAmount / ReversePayment.</summary>
|
||||
public sealed class TripRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? DispatchDate { get; set; }
|
||||
public long? LoadingNo { get; set; }
|
||||
public string? DischargeAuthNo { get; set; }
|
||||
public string? DischargeEntryDate { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? Trn { get; set; }
|
||||
public string? Nnpn { get; set; }
|
||||
public long? WageClaimId { get; set; }
|
||||
public long? WageClaimNo { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
public int DieselCharge { get; set; }
|
||||
public string? HavePaymentMethod { get; set; }
|
||||
public decimal? WaterAmount { get; set; }
|
||||
public int? ReversePayment { get; set; }
|
||||
public decimal? NetWage { get; set; }
|
||||
}
|
||||
|
||||
public sealed record TripGridDto(
|
||||
long Id, string? Pn, string? DispatchDate, long? LoadingNo, string? DischargeAuthNo, string? DischargeEntryDate,
|
||||
string? Tn, string? Trn, string? Nnpn, long? WageClaimId, long? WageClaimNo, string? StatusCode,
|
||||
int DieselCharge, bool HasPaymentMethod, bool HasWater, bool Reversed, decimal? NetWage);
|
||||
|
||||
// ---------------------------------------------------------------- one trip
|
||||
/// <summary>Raw row of REFINERY_TRIPS_VIEW for the form and the actions.</summary>
|
||||
public sealed class TripRecord
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
public string? DispatchDate { get; set; }
|
||||
public string? ActualLoadingDate { get; set; }
|
||||
public DateTime? LoadingDate { get; set; }
|
||||
public string? ClientName { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? Trn { get; set; }
|
||||
public string? Nnpn { get; set; }
|
||||
public string? Drvr { get; set; }
|
||||
public long? LoadingNo { get; set; }
|
||||
public decimal? GrossWeight { get; set; }
|
||||
public decimal? EmptyWeight { get; set; }
|
||||
public decimal? NetLoadingWeight { get; set; }
|
||||
public decimal? LitersWeight { get; set; }
|
||||
public string? DischargeAuthNo { get; set; }
|
||||
public string? DischargeEntryDate { get; set; }
|
||||
public decimal? ActualGrossWeight { get; set; }
|
||||
public decimal? ActualEmptyWeight { get; set; }
|
||||
public decimal? NetDischargeWeight { get; set; }
|
||||
public decimal? WaterAmount { get; set; }
|
||||
public decimal? SedimentAmount { get; set; }
|
||||
public decimal? WeightDifference { get; set; }
|
||||
public decimal? NetWage { get; set; }
|
||||
public decimal? TripNetWage { get; set; }
|
||||
public decimal? RemainingBalance { get; set; }
|
||||
public int DieselCharge { get; set; }
|
||||
public int? ReversePayment { get; set; }
|
||||
public decimal? FirstAdvancePayment { get; set; }
|
||||
public decimal? SecondAdvancePayment { get; set; }
|
||||
public decimal? PenaltyAmount { get; set; }
|
||||
public decimal? PenaltyQuantity { get; set; }
|
||||
public string? HavePaymentMethod { get; set; }
|
||||
public string? DriverWalletNumber { get; set; }
|
||||
public long? WageClaimId { get; set; }
|
||||
public long? WageClaimNo { get; set; }
|
||||
public string? CardNumber { get; set; }
|
||||
public decimal? CurrentBalance { get; set; }
|
||||
public long? RefineryWalletId { get; set; }
|
||||
public decimal? DinarakReferenceId { get; set; }
|
||||
public string? Remarks { get; set; }
|
||||
public string? ReceivedByName { get; set; }
|
||||
public DateTime? ReceivedDate { get; set; }
|
||||
public DateTime? PaymentedDate { get; set; }
|
||||
public string? PaymentOptions { get; set; }
|
||||
public long? VoucherSerialNumber { get; set; }
|
||||
public string? PaidEpayment { get; set; }
|
||||
public string? PaymentMethod { get; set; }
|
||||
public string? OwnerName { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Active REFINERY_WALLET of the truck (legacy checkEWallet) or the wallet the trip was paid to.</summary>
|
||||
public sealed class TripWallet
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public int? Epayment { get; set; }
|
||||
public string? WalletNumber { get; set; }
|
||||
public long? OwnerNnpn { get; set; }
|
||||
public string? OwnerName { get; set; }
|
||||
public string? DriverName { get; set; }
|
||||
public long? DriverNnpn { get; set; }
|
||||
public string? BankAccount { get; set; }
|
||||
public string? Iban { get; set; }
|
||||
public string? BankName { get; set; }
|
||||
}
|
||||
|
||||
public sealed record TripWalletDto(
|
||||
int? Epayment, string? WalletNumber, string? OwnerNnpn, string? OwnerName, string? BankAccount, string? Iban, string? BankName,
|
||||
string? DriverWalletNumber);
|
||||
|
||||
public sealed record TripDetailDto(
|
||||
long Id,
|
||||
string? Pn,
|
||||
string? StatusCode,
|
||||
string? DispatchDate,
|
||||
string? ActualLoadingDate,
|
||||
string? ClientName,
|
||||
string? Tn,
|
||||
string? Trn,
|
||||
string? Nnpn,
|
||||
string? DriverName,
|
||||
long? LoadingNo,
|
||||
decimal? GrossWeight,
|
||||
decimal? EmptyWeight,
|
||||
decimal? NetLoadingWeight,
|
||||
decimal? LitersWeight,
|
||||
string? DischargeAuthNo,
|
||||
string? DischargeEntryDate,
|
||||
decimal? ActualGrossWeight,
|
||||
decimal? ActualEmptyWeight,
|
||||
decimal? NetDischargeWeight,
|
||||
decimal? WaterAmount,
|
||||
decimal? SedimentAmount,
|
||||
decimal? WeightDifference,
|
||||
decimal? NetWage,
|
||||
decimal? TripNetWage,
|
||||
decimal? RemainingBalance,
|
||||
int DieselCharge,
|
||||
bool Reversed,
|
||||
string? CardNumber,
|
||||
decimal? CurrentBalance,
|
||||
decimal? NewBalance,
|
||||
decimal? FirstPaymentValue,
|
||||
decimal? SecondPaymentValue,
|
||||
long? WageClaimId,
|
||||
long? WageClaimNo,
|
||||
string? Remarks,
|
||||
string? ReceivedByName,
|
||||
string? ReceivedDate,
|
||||
string? PaymentedDate,
|
||||
string? PaymentOptions,
|
||||
long? VoucherSerialNumber,
|
||||
bool AuditMode,
|
||||
TripWalletDto? Wallet,
|
||||
IReadOnlyList<string> Actions);
|
||||
|
||||
// ---------------------------------------------------------------- log
|
||||
public sealed class TripLogRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? MethodName { get; set; }
|
||||
public string? LogDate { get; set; }
|
||||
public string? Login { get; set; }
|
||||
public string? OldData { get; set; }
|
||||
public string? NewData { get; set; }
|
||||
}
|
||||
|
||||
public sealed record TripLogDto(long Id, string? MethodName, string? LogDate, string? Login, string? OldData, string? NewData);
|
||||
|
||||
// ---------------------------------------------------------------- print
|
||||
/// <summary>Cash voucher "سند صرف نقدي" (legacy print): the page prints it, the serial is stored on the trip.</summary>
|
||||
public sealed record TripVoucherDto(
|
||||
long Id, string Pn, string Serial, string Date, decimal Amount, string? DischargeAuthNo, string? OwnerName);
|
||||
|
||||
// ---------------------------------------------------------------- reports
|
||||
public sealed record DieselReportQuery(
|
||||
string? Pn = null, string? Tn = null, string? StatusCode = null, string? DischargeAuthNo = null, string? DieselCharge = null,
|
||||
DateTime? DateFrom = null, DateTime? DateTo = null);
|
||||
|
||||
public sealed class DieselReportRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
public string? DischargeAuthNo { get; set; }
|
||||
public DateTime? CreationDate { get; set; }
|
||||
public string? FirstName { get; set; }
|
||||
public string? MethodName { get; set; }
|
||||
public decimal? BalanceBefore { get; set; }
|
||||
public decimal? BalanceAfter { get; set; }
|
||||
public decimal? Amount { get; set; }
|
||||
}
|
||||
|
||||
public sealed class CardRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long Tn { get; set; }
|
||||
public string? CardNumber { get; set; }
|
||||
public decimal? CurrentBalance { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Row of the trips excel report (legacy report(), manager column set).</summary>
|
||||
public sealed class TripReportRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? DispatchDate { get; set; }
|
||||
public long? LoadingNo { get; set; }
|
||||
public string? DischargeAuthNo { get; set; }
|
||||
public string? DischargeEntryDate { get; set; }
|
||||
public decimal? NetLoadingWeight { get; set; }
|
||||
public decimal? NetDischargeWeight { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? Trn { get; set; }
|
||||
public string? Nnpn { get; set; }
|
||||
public decimal? CurrentBalance { get; set; }
|
||||
public int DieselCharge { get; set; }
|
||||
public decimal? NetWage { get; set; }
|
||||
public decimal? TripNetWage { get; set; }
|
||||
public decimal? RemainingBalance { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
public long? WageClaimNo { get; set; }
|
||||
public DateTime? PaymentedDate { get; set; }
|
||||
public DateTime? ReceivedDate { get; set; }
|
||||
public string? ReceivedByName { get; set; }
|
||||
public string? ActualLoadingDate { get; set; }
|
||||
public string? PaymentMethod { get; set; }
|
||||
public string? PaidEpayment { get; set; }
|
||||
public string? PaymentOptions { get; set; }
|
||||
public string? OwnerName { get; set; }
|
||||
public string? OwnerNameEnglish { get; set; }
|
||||
public string? BankName { get; set; }
|
||||
public string? Iban { get; set; }
|
||||
public string? BankAccount { get; set; }
|
||||
public string? WalletNumber { get; set; }
|
||||
public long? OwnerNnpn { get; set; }
|
||||
}
|
||||
|
||||
public sealed record BankReportQuery(string? BankAccount, string? StatusCode, string? HasWageClaim, DateTime? PaymentedDateFrom, DateTime? PaymentedDateTo);
|
||||
|
||||
public sealed record RecalculateBalanceRequest(DateTime StartDate, DateTime EndDate, long VariableGroupId);
|
||||
|
||||
/// <summary>Result of an export: file content, name and content type.</summary>
|
||||
public sealed record TripExportFile(byte[] Content, string FileName, string ContentType);
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
|
||||
namespace NTP.Application.Refinery.Trips;
|
||||
|
||||
/// <summary>Configuration of the trips slice (section "Refinery:Trips").</summary>
|
||||
public sealed class TripOptions
|
||||
{
|
||||
public const string SectionName = "Refinery:Trips";
|
||||
|
||||
/// <summary>
|
||||
/// Largest net wage a payment action accepts (legacy application.REFINERY_MAX_PAYMENT_AMOUNT, defined outside the repository;
|
||||
/// the caption ERROR.PAYMENT_ISNOT_ALLOW_FOR_BIG_AMOUNT says 500 dinars). UNVERIFIED default.
|
||||
/// </summary>
|
||||
public decimal MaxPaymentAmount { get; set; } = 500m;
|
||||
}
|
||||
|
||||
/// <summary>Reads <see cref="TripOptions"/> (Application has no Options package; implemented in Infrastructure).</summary>
|
||||
public interface ITripSettingsService
|
||||
{
|
||||
TripOptions Value { get; }
|
||||
}
|
||||
|
||||
public sealed record TripLock(string? StatusCode, int DieselCharge);
|
||||
|
||||
public sealed record CardInfo(long Id, decimal CurrentBalance);
|
||||
|
||||
/// <summary>Data access of the refinery trips (REFINERY_TRIPS and its view, cards, logs, DB functions).</summary>
|
||||
public interface ITripRepository
|
||||
{
|
||||
// ---- reads
|
||||
Task<PagedResult<TripRow>> SearchAsync(TripQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<TripRecord?> GetAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>SELECT ... FOR UPDATE of the trip (inside a transaction): serialises two operators acting on the same trip.</summary>
|
||||
Task<TripLock?> LockAsync(long id, CancellationToken ct = default);
|
||||
Task<TripWallet?> GetActiveWalletByTruckAsync(string tn, CancellationToken ct = default);
|
||||
Task<TripWallet?> GetWalletAsync(long walletId, CancellationToken ct = default);
|
||||
/// <summary>REFINERY_VARIABLES AUTDIT_MODE = 1 (legacy checkAuditMode).</summary>
|
||||
Task<bool> GetAuditModeAsync(CancellationToken ct = default);
|
||||
/// <summary>FIRST_ADVANCE_PAYMENT valid today (legacy getFirstPaymentValue).</summary>
|
||||
Task<decimal?> GetFirstPaymentValueAsync(CancellationToken ct = default);
|
||||
/// <summary>All KEY_NAME / KEY_VALUE of the variables valid on the (truncated) loading date.</summary>
|
||||
Task<IReadOnlyList<KeyValuePair<string, string?>>> GetVariablesAsync(DateTime loadingDate, CancellationToken ct = default);
|
||||
/// <summary>WATER_FLAG of the trip, or null when the column does not exist yet in this database / is empty.</summary>
|
||||
Task<int?> GetWaterFlagAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>CalculateRefinaryDiesel(id); null when the function finds no price (ORA-01403).</summary>
|
||||
Task<decimal?> CalculateDieselAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>CalculateRefinaryAmount(id); null when the function finds no price (ORA-01403).</summary>
|
||||
Task<decimal?> CalculateAmountAsync(long id, CancellationToken ct = default);
|
||||
Task<bool> HasTransferLogAsync(long id, CancellationToken ct = default);
|
||||
Task<IReadOnlyList<TripRecord>> GetTripsOfPeriodAsync(DateTime from, DateTime to, CancellationToken ct = default);
|
||||
|
||||
// ---- diesel cards
|
||||
Task<CardInfo?> GetActiveCardAsync(string tn, CancellationToken ct = default);
|
||||
Task<decimal?> GetLastCardLogAmountAsync(string pn, string methodName, CancellationToken ct = default);
|
||||
Task InsertCardLogAsync(long cardId, string methodName, decimal before, decimal after, decimal amount, string userId, string pn, CancellationToken ct = default);
|
||||
Task UpdateCardBalanceAsync(long cardId, decimal balance, string userId, long tripId, CancellationToken ct = default);
|
||||
|
||||
// ---- writes on the trip
|
||||
Task MarkFirstAdvanceAsync(long id, string userId, CancellationToken ct = default);
|
||||
Task MarkSecondAdvanceAsync(long id, string userId, decimal secondPaymentValue, CancellationToken ct = default);
|
||||
Task MarkAdvanceReversedAsync(long id, string userId, int dieselCharge, CancellationToken ct = default);
|
||||
/// <summary>Legacy NetWageAmount: stores the computed figures on the trip.</summary>
|
||||
Task SaveAmountsAsync(long id, string userId, TripAmounts amounts, CancellationToken ct = default);
|
||||
/// <summary>RECEIPT (READY_TO_PAY) and EXCHANGE_AUDIT (PENDING_EXCHANGE): new status + received by / date.</summary>
|
||||
Task SetStatusReceivedAsync(long id, string userId, string status, CancellationToken ct = default);
|
||||
/// <summary>Status EXCHANGED. <paramref name="setReceived"/> also fills RECEIVED_BY/DATE (not done by the bank-transfer PAYMENT).</summary>
|
||||
Task MarkExchangedAsync(long id, string userId, string? remarks, string? paymentOptions, bool setReceived, long? walletId, CancellationToken ct = default);
|
||||
Task<decimal> BumpDinarakReferenceAsync(long id, string userId, CancellationToken ct = default);
|
||||
Task SetVoucherSerialAsync(long id, long serial, CancellationToken ct = default);
|
||||
/// <summary>Legacy DAO.CONFIRM_EXCHANGE: EXCHANGED with wallet / user / date taken from the last Dinarak log and EXCHANGE log rows.</summary>
|
||||
Task ConfirmExchangeAsync(long id, string userId, CancellationToken ct = default);
|
||||
|
||||
// ---- history
|
||||
Task InsertLogAsync(long tripId, string methodName, string userId, string oldJson, string newJson, CancellationToken ct = default);
|
||||
Task<PagedResult<TripLogRow>> SearchLogAsync(long tripId, PageRequest page, CancellationToken ct = default);
|
||||
|
||||
// ---- reports
|
||||
Task<IReadOnlyList<TripReportRow>> ReportAsync(TripQuery query, CancellationToken ct = default);
|
||||
Task<IReadOnlyList<DieselReportRow>> DieselReportAsync(DieselReportQuery query, CancellationToken ct = default);
|
||||
Task<IReadOnlyList<CardRow>> CardsAsync(string? tn, CancellationToken ct = default);
|
||||
Task<IReadOnlyList<TripReportRow>> BankReportAsync(BankReportQuery query, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
/// <summary>Voucher serial of the cash voucher (NTP.SYSTEM_VARIABLES VOUCHER_SERIAL_NO, legacy GenerateSerialNumber('VOUCHER')). NTP-schema connection.</summary>
|
||||
public interface IVoucherSerialRepository
|
||||
{
|
||||
/// <summary>Takes the next number (locks the row until commit) and returns <c>{yyyy}{seq:00000}</c> as a number.</summary>
|
||||
Task<long> NextAsync(CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
public interface IVariablesRepository
|
||||
{
|
||||
/// <summary>Pricing periods, newest group first (legacy sort GROUP_ID DESC).</summary>
|
||||
Task<PagedResult<VariablesSetRow>> SearchAsync(VariablesQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<VariablesSetRow?> GetAsync(long groupId, CancellationToken ct = default);
|
||||
/// <summary>Periods of every group (AUTDIT_MODE ignored), optionally without one group.</summary>
|
||||
Task<IReadOnlyList<VariablesPeriod>> GetPeriodsAsync(long? excludeGroupId, CancellationToken ct = default);
|
||||
/// <summary>Any REFINERY_TRIPS row loaded (ACTUAL_LOADING_DATE) inside the period.</summary>
|
||||
Task<bool> HasTripsAsync(DateTime start, DateTime end, CancellationToken ct = default);
|
||||
Task<TripsOfPeriodInfo> GetTripsOfPeriodAsync(DateTime start, DateTime end, CancellationToken ct = default);
|
||||
Task<long> NextGroupIdAsync(CancellationToken ct = default);
|
||||
Task InsertSetAsync(long groupId, DateOnly start, DateOnly end, IReadOnlyDictionary<string, string> values, string createdBy, CancellationToken ct = default);
|
||||
Task UpdateSetAsync(long groupId, DateOnly start, DateOnly end, IReadOnlyDictionary<string, string> values, string updatedBy, CancellationToken ct = default);
|
||||
/// <summary>Writes TON_PRICE_CORRECTION = value and TON_PRICE_CORRECTION_SET = 1 (rows are inserted when missing).</summary>
|
||||
Task SetTonPriceCorrectionAsync(long groupId, string value, DateTime start, DateTime end, string userId, CancellationToken ct = default);
|
||||
Task<IReadOnlyList<RemainingBalanceRow>> GetRemainingBalancesAsync(CancellationToken ct = default);
|
||||
}
|
||||
|
||||
public interface IVariablesService
|
||||
{
|
||||
Task<PagedResult<VariablesSetRow>> SearchAsync(VariablesQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<VariablesSetDetail> GetAsync(long groupId, CancellationToken ct);
|
||||
Task<VariablesResult> CreateAsync(SaveVariablesRequest request, CancellationToken ct);
|
||||
Task<VariablesResult> UpdateAsync(long groupId, SaveVariablesRequest request, CancellationToken ct);
|
||||
Task<VariablesResult> SetTonPriceCorrectionAsync(long groupId, TonPriceCorrectionRequest request, CancellationToken ct);
|
||||
Task<ExportFile> ExportAsync(VariablesQuery query, CancellationToken ct);
|
||||
Task<ExportFile> ExportRemainingBalanceAsync(CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Step of UPDATE_TON_PRICE_CORRECTION that recalculates the previous balances of the trucks of a period
|
||||
/// (legacy refinerytripFactory.calculateRemainigBalance). Throws <see cref="BusinessException"/> when it must stop the action.
|
||||
/// The calculation of the trip amounts belongs to the trips module: see <c>TonPriceRecalculationService</c>.
|
||||
/// </summary>
|
||||
public interface ITonPriceRecalculationService
|
||||
{
|
||||
Task RecalculateAsync(long groupId, DateTime start, DateTime end, CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
using NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
/// <summary>
|
||||
/// Recalculation after the actual ton price (TON_PRICE_CORRECTION) is set: legacy UPDATE_TON_PRICE_CORRECTION calls
|
||||
/// refinerytripFactory.calculateRemainigBalance (refinerytripfactory.cfc:1269). That port lives in the trips module
|
||||
/// (<see cref="IRemainingBalanceService.RecalculateForPeriodAsync"/>: trips must exist and be exchanged, the net wage difference of every
|
||||
/// penalised trip goes to the truck's remaining balance). It joins the caller's transaction (DbSession nesting), so a failure rolls back the
|
||||
/// correction rows too (legacy reset them to 0 instead).
|
||||
/// </summary>
|
||||
public sealed class TonPriceRecalculationService(IRemainingBalanceService balances) : ITonPriceRecalculationService
|
||||
{
|
||||
public async Task RecalculateAsync(long groupId, DateTime start, DateTime end, CancellationToken ct = default) =>
|
||||
await balances.RecalculateForPeriodAsync(start, end, groupId, ct);
|
||||
}
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
/// <summary>
|
||||
/// One pricing period ("variables set"): the rows of REFINERY_VARIABLES that share a GROUP_ID, pivoted like the legacy
|
||||
/// REFINERY_VARIABLES_VIEW (plus the ton price correction, which the view leaves out). Class with settable properties (Dapper + Oracle NUMBER).
|
||||
/// </summary>
|
||||
public class VariablesSetRow
|
||||
{
|
||||
public long GroupId { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
public decimal? DieselLiterPrice { get; set; }
|
||||
public decimal? TonWage { get; set; }
|
||||
public decimal? TonPrice { get; set; }
|
||||
public decimal? DriverTip { get; set; }
|
||||
public decimal? PermitDispatch { get; set; }
|
||||
public decimal? WaybillFee { get; set; }
|
||||
public decimal? Commission { get; set; }
|
||||
public decimal? TolerancePercentage { get; set; }
|
||||
public decimal? FirstAdvancePayment { get; set; }
|
||||
/// <summary>TON_PRICE_CORRECTION (actual ton price), null when never set.</summary>
|
||||
public decimal? TonPriceCorrection { get; set; }
|
||||
/// <summary>TON_PRICE_CORRECTION_SET = 1: the correction was applied, it cannot be set again (legacy ERROR.YOU_CANNOT_RESET_TON_PRICE).</summary>
|
||||
public bool TonPriceCorrectionSet { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Detail of one period: the row plus what the caller may still do with it.</summary>
|
||||
public sealed class VariablesSetDetail : VariablesSetRow
|
||||
{
|
||||
/// <summary>No trip was loaded inside the period (legacy getrefinery_variables sets ACTIONS = UPDATE).</summary>
|
||||
public bool CanUpdate { get; set; }
|
||||
/// <summary>The ton price correction was not applied yet.</summary>
|
||||
public bool CanSetTonPriceCorrection { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Period of a set (legacy overlap checks).</summary>
|
||||
public sealed record VariablesPeriod(long GroupId, DateTime Start, DateTime End);
|
||||
|
||||
/// <summary>Grid filters (legacy START_DATE_STRING / END_DATE_STRING of the search form).</summary>
|
||||
/// <param name="StartDate">Both dates: periods starting inside [StartDate, EndDate]. Only this: periods starting on this day.</param>
|
||||
/// <param name="EndDate">Only this: periods ending on this day.</param>
|
||||
public sealed record VariablesQuery(DateOnly? StartDate, DateOnly? EndDate);
|
||||
|
||||
/// <summary>Body of create / update. Dates as yyyy-MM-dd.</summary>
|
||||
public sealed class SaveVariablesRequest
|
||||
{
|
||||
public DateOnly StartDate { get; set; }
|
||||
public DateOnly EndDate { get; set; }
|
||||
public decimal DieselLiterPrice { get; set; }
|
||||
public decimal FirstAdvancePayment { get; set; }
|
||||
public decimal TonWage { get; set; }
|
||||
public decimal TonPrice { get; set; }
|
||||
public decimal DriverTip { get; set; }
|
||||
public decimal PermitDispatch { get; set; }
|
||||
public decimal WaybillFee { get; set; }
|
||||
public decimal Commission { get; set; }
|
||||
public decimal TolerancePercentage { get; set; }
|
||||
}
|
||||
|
||||
public sealed class TonPriceCorrectionRequest
|
||||
{
|
||||
public decimal TonPriceCorrection { get; set; }
|
||||
}
|
||||
|
||||
public sealed record VariablesResult(string Message, long? Id = null);
|
||||
|
||||
/// <summary>What the ton price recalculation needs to know about the trips of a period (legacy refinerytripFactory.calculateRemainigBalance).</summary>
|
||||
public sealed class TripsOfPeriodInfo
|
||||
{
|
||||
public long TripCount { get; set; }
|
||||
/// <summary>Trips still in READY_TO_PAY, PENDING_EXCHANGE, DISCHARGING, LOADED, RESD or ARRIVE_LOCATION.</summary>
|
||||
public long NotExchangedCount { get; set; }
|
||||
/// <summary>Trips with PENALTY_AMOUNT > 0: the only ones whose balance is recalculated.</summary>
|
||||
public long PenaltyTripCount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Row of REFINERY_REMAINING_BALANCE (previous balances per truck).</summary>
|
||||
public sealed class RemainingBalanceRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long Tn { get; set; }
|
||||
public decimal RemainingBalance { get; set; }
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
using System.Globalization;
|
||||
|
||||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
/// <summary>User-facing texts (legacy captions, verbatim; the ones marked * have no row in LT_CAPTION and are new wording).</summary>
|
||||
public static class VariablesMessages
|
||||
{
|
||||
public const string DateOverlap = "يوجد تداخل في فترة التسعير"; // ERROR.DATE_IS_EXIT_IN_PREVIOUS_PERIOD
|
||||
public const string StartDateInPreviousPeriod = "تاريخ بداية فترة التسعير يقع ضمن فترة تسعير سابقة"; // * ERROR.START_DATE_IS_EXIT_IN_PREVIOUS_PERIOD
|
||||
public const string EndDateInPreviousPeriod = "تاريخ نهاية فترة التسعير يقع ضمن فترة تسعير سابقة"; // * ERROR.END_DATE_IS_EXIT_IN_PREVIOUS_PERIOD
|
||||
public const string DieselPriceNotCorrect = "سعر لتر الديزل غير صحيح"; // * ERROR.DIESEL_LITER_PRICE_IS_NOT_CORRECT
|
||||
public const string TonWageNotCorrect = "اجور الطن غير صحيحة"; // * ERROR.TON_WAGE_IS_NOT_CORRECT
|
||||
public const string StartAfterEnd = "لا يجوز أن يكون تاريخ بداية الفترة أكبر من تاريخ نهايتها"; // * ERROR.START_DATE_CAN_NOT_GREATER_THAN_END_DATE
|
||||
public const string TripsExist = "لا يمكن تعديل القيم بسبب وجود ارساليات مسعره عليها"; // ERROR.YOU_CANNOT_UPDATE_VARIABLES_THERE_IS_TRIPS
|
||||
public const string CannotResetTonPrice = "تم تعديل سعر الطن الفعلي سابقا"; // ERROR.YOU_CANNOT_RESET_TON_PRICE
|
||||
public const string NoTripsInPeriod = "لا يوجد ارساليات ضمن هذه الفترة"; // ERROR.THERE_IS_NO_ANY_TRIP_IN_THIS_PERIOD
|
||||
public const string NotAllTripsExchanged = "لا يمكن اعادة تسعير سعر النفط ، يجب ان تكون جميع الارساليات ضمن الفترة مسددة"; // ERROR.NO_TON_PRICE_EDIT_NOT_ALL_TRIPS_EXCHANGED
|
||||
public const string RecalculationNotAvailable = "إعادة احتساب الذمم السابقة غير متوفرة بعد، لا يمكن تعديل سعر الطن الفعلي لفترة فيها ارساليات مغرمة"; // * (balance recalculation belongs to the trips module)
|
||||
public const string NotFound = "فترة التسعير غير موجودة"; // *
|
||||
public const string Done = "";
|
||||
}
|
||||
|
||||
public static class VariablesErrors
|
||||
{
|
||||
public const string DateOverlap = "DATE_IS_EXIT_IN_PREVIOUS_PERIOD";
|
||||
public const string StartDateInPreviousPeriod = "START_DATE_IS_EXIT_IN_PREVIOUS_PERIOD";
|
||||
public const string EndDateInPreviousPeriod = "END_DATE_IS_EXIT_IN_PREVIOUS_PERIOD";
|
||||
public const string DieselPriceNotCorrect = "DIESEL_LITER_PRICE_IS_NOT_CORRECT";
|
||||
public const string TonWageNotCorrect = "TON_WAGE_IS_NOT_CORRECT";
|
||||
public const string StartAfterEnd = "START_DATE_CAN_NOT_GREATER_THAN_END_DATE";
|
||||
public const string TripsExist = "YOU_CANNOT_UPDATE_VARIABLES_THERE_IS_TRIPS";
|
||||
public const string CannotResetTonPrice = "YOU_CANNOT_RESET_TON_PRICE";
|
||||
public const string NoTripsInPeriod = "THERE_IS_NO_ANY_TRIP_IN_THIS_PERIOD";
|
||||
public const string NotAllTripsExchanged = "NO_TON_PRICE_EDIT_NOT_ALL_TRIPS_EXCHANGED";
|
||||
public const string RecalculationNotAvailable = "TON_PRICE_RECALCULATION_NOT_AVAILABLE";
|
||||
public const string NotFound = "REFINERY_VARIABLES_NOT_FOUND";
|
||||
}
|
||||
|
||||
/// <summary>Pure rules of the pricing periods (refinery_variablesfactory.cfc create / update / UPDATE_TON_PRICE_CORRECTION).</summary>
|
||||
public static class VariablesRules
|
||||
{
|
||||
/// <summary>Row of the same table that is not a pricing period: read by the trips module, ignored by the period checks.</summary>
|
||||
public const string AuditModeKey = "AUTDIT_MODE";
|
||||
public const string TonPriceCorrectionKey = "TON_PRICE_CORRECTION";
|
||||
public const string TonPriceCorrectionSetKey = "TON_PRICE_CORRECTION_SET";
|
||||
|
||||
/// <summary>The keys a period holds (legacy DAO create / update whitelist).</summary>
|
||||
public static readonly string[] SetKeys =
|
||||
[
|
||||
"COMMISSION", "DIESEL_LITER_PRICE", "TON_WAGE", "TON_PRICE", "DRIVER_TIP", "WAYBILL_FEE", "FIRST_ADVANCE_PAYMENT",
|
||||
"PERMIT_DISPATCH", "TOLERANCE_PERCENTAGE",
|
||||
];
|
||||
|
||||
/// <summary>KEY_VALUE is a VARCHAR2: the number as plain invariant text (legacy stored what the user typed).</summary>
|
||||
public static string FormatValue(decimal value) => value.ToString(CultureInfo.InvariantCulture);
|
||||
|
||||
public static Dictionary<string, string> ToValues(SaveVariablesRequest r) => new()
|
||||
{
|
||||
["COMMISSION"] = FormatValue(r.Commission),
|
||||
["DIESEL_LITER_PRICE"] = FormatValue(r.DieselLiterPrice),
|
||||
["TON_WAGE"] = FormatValue(r.TonWage),
|
||||
["TON_PRICE"] = FormatValue(r.TonPrice),
|
||||
["DRIVER_TIP"] = FormatValue(r.DriverTip),
|
||||
["WAYBILL_FEE"] = FormatValue(r.WaybillFee),
|
||||
["FIRST_ADVANCE_PAYMENT"] = FormatValue(r.FirstAdvancePayment),
|
||||
["PERMIT_DISPATCH"] = FormatValue(r.PermitDispatch),
|
||||
["TOLERANCE_PERCENTAGE"] = FormatValue(r.TolerancePercentage),
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// The first failing rule, in the legacy order (refinery_variablesfactory.cfc:112-143): start inside another period, end inside another
|
||||
/// period, another period wholly inside the new one, diesel price in (0, 2), ton wage in (0, 100), start after end.
|
||||
/// <paramref name="otherPeriods"/> must already exclude the period being updated.
|
||||
/// </summary>
|
||||
public static (string Code, string Message)? FirstError(IEnumerable<VariablesPeriod> otherPeriods, SaveVariablesRequest r)
|
||||
{
|
||||
var start = r.StartDate.ToDateTime(TimeOnly.MinValue);
|
||||
var end = r.EndDate.ToDateTime(TimeOnly.MinValue);
|
||||
var others = otherPeriods.ToList();
|
||||
if (others.Any(p => p.Start.Date <= start && start <= p.End.Date))
|
||||
return (VariablesErrors.StartDateInPreviousPeriod, VariablesMessages.StartDateInPreviousPeriod);
|
||||
if (others.Any(p => p.Start.Date <= end && end <= p.End.Date))
|
||||
return (VariablesErrors.EndDateInPreviousPeriod, VariablesMessages.EndDateInPreviousPeriod);
|
||||
if (others.Any(p => p.Start.Date > start && p.End.Date < end))
|
||||
return (VariablesErrors.DateOverlap, VariablesMessages.DateOverlap);
|
||||
if (r.DieselLiterPrice <= 0 || r.DieselLiterPrice >= 2)
|
||||
return (VariablesErrors.DieselPriceNotCorrect, VariablesMessages.DieselPriceNotCorrect);
|
||||
if (r.TonWage <= 0 || r.TonWage >= 100)
|
||||
return (VariablesErrors.TonWageNotCorrect, VariablesMessages.TonWageNotCorrect);
|
||||
if (start > end)
|
||||
return (VariablesErrors.StartAfterEnd, VariablesMessages.StartAfterEnd);
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Legacy compares the stored TON_PRICE with the typed correction; the balances are only recalculated when they differ
|
||||
/// (refinery_variablesfactory.cfc:307).
|
||||
/// </summary>
|
||||
public static bool TonPriceChanges(decimal? currentTonPrice, decimal correction) => currentTonPrice is not null && currentTonPrice.Value != correction;
|
||||
}
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
using FluentValidation;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
using NTP.Application.Grains.Reports;
|
||||
|
||||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinery_variablesfactory.cfc / refinery_variablesfactoryweb.cfc (screen REFINERY_VARIABLES, تسعير عطاء النفط الخام).
|
||||
/// Access is decided only by the permission keys on the controller (SU / REFINERY_MGR); the legacy REFINERY_MGR / REFINERY_AC role branches are not ported.
|
||||
/// There is no log: the legacy log call is commented out and no REFINERY_VARIABLES_LOG table exists.
|
||||
/// </summary>
|
||||
public sealed class VariablesService(
|
||||
IVariablesRepository repository,
|
||||
ITonPriceRecalculationService recalculation,
|
||||
IUnitOfWork unitOfWork,
|
||||
ICurrentUser user,
|
||||
IReportExcelService excel,
|
||||
IValidator<SaveVariablesRequest> saveValidator,
|
||||
IValidator<TonPriceCorrectionRequest> correctionValidator) : IVariablesService
|
||||
{
|
||||
private const string ExcelType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
|
||||
public Task<PagedResult<VariablesSetRow>> SearchAsync(VariablesQuery query, PageRequest page, CancellationToken ct) =>
|
||||
repository.SearchAsync(query, page, ct);
|
||||
|
||||
public async Task<VariablesSetDetail> GetAsync(long groupId, CancellationToken ct)
|
||||
{
|
||||
var row = await repository.GetAsync(groupId, ct) ?? throw new NotFoundException("Refinery variables", groupId);
|
||||
var canUpdate = row.StartDate is not null && row.EndDate is not null
|
||||
&& !await repository.HasTripsAsync(row.StartDate.Value, row.EndDate.Value, ct);
|
||||
return new VariablesSetDetail
|
||||
{
|
||||
GroupId = row.GroupId, StartDate = row.StartDate, EndDate = row.EndDate, DieselLiterPrice = row.DieselLiterPrice,
|
||||
TonWage = row.TonWage, TonPrice = row.TonPrice, DriverTip = row.DriverTip, PermitDispatch = row.PermitDispatch,
|
||||
WaybillFee = row.WaybillFee, Commission = row.Commission, TolerancePercentage = row.TolerancePercentage,
|
||||
FirstAdvancePayment = row.FirstAdvancePayment, TonPriceCorrection = row.TonPriceCorrection,
|
||||
TonPriceCorrectionSet = row.TonPriceCorrectionSet,
|
||||
CanUpdate = canUpdate,
|
||||
CanSetTonPriceCorrection = !row.TonPriceCorrectionSet,
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<VariablesResult> CreateAsync(SaveVariablesRequest request, CancellationToken ct)
|
||||
{
|
||||
await saveValidator.ValidateAndThrowAsync(request, ct);
|
||||
var error = VariablesRules.FirstError(await repository.GetPeriodsAsync(null, ct), request);
|
||||
if (error is { } e) throw new BusinessException(e.Code, e.Message);
|
||||
|
||||
var groupId = await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
var id = await repository.NextGroupIdAsync(token);
|
||||
await repository.InsertSetAsync(id, request.StartDate, request.EndDate, VariablesRules.ToValues(request), user.UserId, token);
|
||||
return id;
|
||||
}, ct);
|
||||
return new VariablesResult(VariablesMessages.Done, groupId);
|
||||
}
|
||||
|
||||
public async Task<VariablesResult> UpdateAsync(long groupId, SaveVariablesRequest request, CancellationToken ct)
|
||||
{
|
||||
await saveValidator.ValidateAndThrowAsync(request, ct);
|
||||
var current = await repository.GetAsync(groupId, ct) ?? throw new NotFoundException("Refinery variables", groupId);
|
||||
var error = VariablesRules.FirstError(await repository.GetPeriodsAsync(groupId, ct), request);
|
||||
if (error is { } e) throw new BusinessException(e.Code, e.Message);
|
||||
|
||||
// refinery_variablesfactory.cfc:162-170: the stored period must not hold a trip (checked on the dates before the change)
|
||||
if (current.StartDate is not null && current.EndDate is not null
|
||||
&& await repository.HasTripsAsync(current.StartDate.Value, current.EndDate.Value, ct))
|
||||
throw new BusinessException(VariablesErrors.TripsExist, VariablesMessages.TripsExist);
|
||||
|
||||
await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
await repository.UpdateSetAsync(groupId, request.StartDate, request.EndDate, VariablesRules.ToValues(request), user.UserId, token);
|
||||
return true;
|
||||
}, ct);
|
||||
return new VariablesResult(VariablesMessages.Done, groupId);
|
||||
}
|
||||
|
||||
/// <summary>UPDATE_TON_PRICE_CORRECTION: sets the actual ton price once; the balances of the trucks are recalculated when it differs from TON_PRICE.</summary>
|
||||
public async Task<VariablesResult> SetTonPriceCorrectionAsync(long groupId, TonPriceCorrectionRequest request, CancellationToken ct)
|
||||
{
|
||||
await correctionValidator.ValidateAndThrowAsync(request, ct);
|
||||
var current = await repository.GetAsync(groupId, ct) ?? throw new NotFoundException("Refinery variables", groupId);
|
||||
if (current.TonPriceCorrectionSet)
|
||||
throw new BusinessException(VariablesErrors.CannotResetTonPrice, VariablesMessages.CannotResetTonPrice);
|
||||
if (current.StartDate is null || current.EndDate is null)
|
||||
throw new BusinessException(VariablesErrors.NotFound, VariablesMessages.NotFound);
|
||||
|
||||
await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
await repository.SetTonPriceCorrectionAsync(groupId, VariablesRules.FormatValue(request.TonPriceCorrection),
|
||||
current.StartDate.Value, current.EndDate.Value, user.UserId, token);
|
||||
// legacy: a failed recalculation resets both rows to 0 (DELETE_ON_PRICE_CORRECTION) and returns the error; here the transaction is rolled back
|
||||
if (VariablesRules.TonPriceChanges(current.TonPrice, request.TonPriceCorrection))
|
||||
await recalculation.RecalculateAsync(groupId, current.StartDate.Value, current.EndDate.Value, token);
|
||||
return true;
|
||||
}, ct);
|
||||
return new VariablesResult(VariablesMessages.Done, groupId);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ reports (Excel)
|
||||
|
||||
public async Task<ExportFile> ExportAsync(VariablesQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = new List<VariablesSetRow>();
|
||||
for (var p = 1; rows.Count < 20000; p++)
|
||||
{
|
||||
var r = await repository.SearchAsync(query, new PageRequest(p, PageRequest.MaxPageSize), ct);
|
||||
rows.AddRange(r.Items);
|
||||
if (r.Items.Count == 0 || rows.Count >= r.TotalCount) break;
|
||||
}
|
||||
var cols = new List<ReportColumn>
|
||||
{
|
||||
new("startDate", "بداية فترة التسعير", "Start", "date"), new("endDate", "نهاية فترة التسعير", "End", "date"),
|
||||
new("dieselLiterPrice", "سعر لتر الديزل", "Diesel liter price"), new("tonWage", "اجور الطن", "Ton wage"),
|
||||
new("tonPrice", "سعر الطن", "Ton price"), new("driverTip", "اكرامية السائق", "Driver tip"),
|
||||
new("permitDispatch", "سعر تسريب الصهريج", "Permit dispatch"), new("waybillFee", "اصدار وثيقة", "Waybill fee"),
|
||||
new("commission", "عمولة الصرف التنافسي", "Commission"), new("tolerancePercentage", "نسبة السماح", "Tolerance"),
|
||||
new("firstAdvancePayment", "قيمة شحن الديزل للتحميل", "First advance payment"),
|
||||
};
|
||||
var data = rows.Select(r => (IReadOnlyDictionary<string, object?>)new Dictionary<string, object?>
|
||||
{
|
||||
["startDate"] = r.StartDate, ["endDate"] = r.EndDate, ["dieselLiterPrice"] = r.DieselLiterPrice, ["tonWage"] = r.TonWage,
|
||||
["tonPrice"] = r.TonPrice, ["driverTip"] = r.DriverTip, ["permitDispatch"] = r.PermitDispatch, ["waybillFee"] = r.WaybillFee,
|
||||
["commission"] = r.Commission, ["tolerancePercentage"] = r.TolerancePercentage, ["firstAdvancePayment"] = r.FirstAdvancePayment,
|
||||
}).ToList();
|
||||
return Build("REFINERY_VARIABLES", "تسعير عطاء النفط الخام", "Crude oil tender pricing", cols, data);
|
||||
}
|
||||
|
||||
/// <summary>refineryRemainingBalanceReport: REFINERY_REMAINING_BALANCE ordered by balance, biggest first.</summary>
|
||||
public async Task<ExportFile> ExportRemainingBalanceAsync(CancellationToken ct)
|
||||
{
|
||||
var rows = await repository.GetRemainingBalancesAsync(ct);
|
||||
var cols = new List<ReportColumn>
|
||||
{
|
||||
new("counter", "متسلسل", "#"), new("tn", "رقم الشاحنة", "Truck"), new("remainingBalance", "قيمة الذمم السابقة", "Previous balance"),
|
||||
};
|
||||
var n = 0;
|
||||
var data = rows.Select(r => (IReadOnlyDictionary<string, object?>)new Dictionary<string, object?>
|
||||
{
|
||||
["counter"] = ++n, ["tn"] = r.Tn, ["remainingBalance"] = r.RemainingBalance,
|
||||
}).ToList();
|
||||
return Build("REMAINING_BALANCE", "قيمة الذمم السابقة", "Previous balance", cols, data);
|
||||
}
|
||||
|
||||
private ExportFile Build(string key, string titleAr, string titleEn, IReadOnlyList<ReportColumn> cols, IReadOnlyList<IReadOnlyDictionary<string, object?>> rows)
|
||||
{
|
||||
var table = new ReportTable { Key = key, TitleAr = titleAr, TitleEn = titleEn, Columns = cols, Rows = rows };
|
||||
var bytes = excel.Build(table, user.UserId, DateTime.Now, true);
|
||||
return new ExportFile(bytes, ExcelType, key + ".xlsx");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
using FluentValidation;
|
||||
|
||||
namespace NTP.Application.Refinery.Variables;
|
||||
|
||||
/// <summary>The form of the screen: every field is required (legacy HTML required), numbers are not negative (class floatnumber, maxlength 7).</summary>
|
||||
public sealed class SaveVariablesValidator : AbstractValidator<SaveVariablesRequest>
|
||||
{
|
||||
public const string Required = "الرجاء ادخال جميع الحقول"; // REPORT.VALIDATION
|
||||
|
||||
public SaveVariablesValidator()
|
||||
{
|
||||
RuleFor(x => x.StartDate).NotEqual(default(DateOnly)).WithMessage(Required);
|
||||
RuleFor(x => x.EndDate).NotEqual(default(DateOnly)).WithMessage(Required);
|
||||
// the value range checks of diesel price and ton wage are in VariablesRules (legacy messages, legacy order)
|
||||
RuleFor(x => x.DieselLiterPrice).GreaterThanOrEqualTo(0).WithMessage(Required);
|
||||
RuleFor(x => x.TonWage).GreaterThanOrEqualTo(0).WithMessage(Required);
|
||||
RuleFor(x => x.FirstAdvancePayment).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.TonPrice).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.DriverTip).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.PermitDispatch).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.WaybillFee).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.Commission).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
RuleFor(x => x.TolerancePercentage).GreaterThanOrEqualTo(0).LessThan(10_000_000m).WithMessage(Required);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class TonPriceCorrectionValidator : AbstractValidator<TonPriceCorrectionRequest>
|
||||
{
|
||||
public TonPriceCorrectionValidator()
|
||||
{
|
||||
// 0 is what DELETE_ON_PRICE_CORRECTION writes to mean "no correction", so it is not a value to set
|
||||
RuleFor(x => x.TonPriceCorrection).GreaterThan(0).LessThan(10_000_000m).WithMessage(SaveVariablesValidator.Required);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.WageClaims;
|
||||
|
||||
/// <summary>Excel (HTML table opened by Excel, like the other V1 exports) of a claim report: company and report title, filter lines, header, rows, footer.</summary>
|
||||
internal static class ClaimExcel
|
||||
{
|
||||
public static string E(object? v) => WebUtility.HtmlEncode(Convert.ToString(v, CultureInfo.InvariantCulture) ?? string.Empty);
|
||||
|
||||
public static string N(decimal v) => v.ToString("0.###", CultureInfo.InvariantCulture);
|
||||
|
||||
public static string D(DateTime? d) => d is null ? string.Empty : d.Value.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture);
|
||||
|
||||
public static ExportFile Build(string title, IEnumerable<string> infoLines, string[] headers, IEnumerable<object?[]> rows, string user, string fileName)
|
||||
{
|
||||
var n = headers.Length;
|
||||
var h = new StringBuilder();
|
||||
h.Append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>");
|
||||
h.Append("<style>.header{font-weight:bold;font-size:28px;}");
|
||||
h.Append(".sub_header{font-weight:bold;font-size:14px;background-color:#034878;color:#FFFFFF;text-align:center;}</style>");
|
||||
h.Append("<table align=\"center\" dir=\"rtl\" border=\"1\">");
|
||||
h.Append($"<tr align=\"center\"><td colspan=\"{n}\" class=\"header\">شركة نافذ للخدمات اللوجستية</td></tr>");
|
||||
h.Append($"<tr align=\"center\"><td colspan=\"{n}\" class=\"header\">{E(title)}</td></tr>");
|
||||
foreach (var line in infoLines) h.Append($"<tr align=\"center\"><td colspan=\"{n}\">{E(line)}</td></tr>");
|
||||
h.Append("<tr align=\"center\">");
|
||||
foreach (var c in headers) h.Append($"<td class=\"sub_header\">{E(c)}</td>");
|
||||
h.Append("</tr>");
|
||||
var count = 0;
|
||||
foreach (var r in rows)
|
||||
{
|
||||
count++;
|
||||
h.Append("<tr align=\"center\">");
|
||||
foreach (var v in r) h.Append($"<td>{E(v)}</td>");
|
||||
h.Append("</tr>");
|
||||
}
|
||||
if (count == 0) h.Append($"<tr><td colspan=\"{n}\">لا يوجد معلومات</td></tr>");
|
||||
h.Append($"<tr><td colspan=\"{n}\">بتاريخ : {DateTime.Now:dd/MM/yyyy HH:mm} - عدد النتائج : {count} - طبع التقرير بواسطة : {E(user)}</td></tr>");
|
||||
h.Append("</table></body></html>");
|
||||
var bytes = new UTF8Encoding(true).GetPreamble().Concat(Encoding.UTF8.GetBytes(h.ToString())).ToArray();
|
||||
return new ExportFile(bytes, "application/vnd.ms-excel", fileName + ".xls");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
|
||||
namespace NTP.Application.Refinery.WageClaims;
|
||||
|
||||
/// <summary>A trip of a claim waiting for the Jopetrol transfer (REFINERY_TRIPS.TRIP_STATUS = 6).</summary>
|
||||
public sealed class TransferTripRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// SQL of refinery_wage_claimdao.cfc (+ the writes of refinery_wage_claimfactory.cfc). REFINERY_TRIPS is only read, except for the columns the
|
||||
/// legacy claim code writes: WAGE_CLAIM_ID, STATUS_CODE (COMPLETE), TRIP_STATUS (7), LAST_UPDATE_DATE, UPDATED_BY.
|
||||
/// </summary>
|
||||
public interface IWageClaimRepository
|
||||
{
|
||||
Task<PagedResult<WageClaimRowDto>> SearchAsync(WageClaimQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<WageClaimRowDto?> GetAsync(long id, CancellationToken ct = default);
|
||||
Task<PagedResult<ClaimTripRowDto>> ClaimTripsAsync(long claimId, PageRequest page, CancellationToken ct = default);
|
||||
|
||||
/// <summary>Trips of the given statuses without a wage claim (optionally limited to a loading date range): the create preview.</summary>
|
||||
Task<PagedResult<ClaimTripRowDto>> CandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly? from, DateOnly? to, PageRequest page, CancellationToken ct = default);
|
||||
Task<int> CountCandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default);
|
||||
|
||||
/// <summary>Takes the next claim number (legacy GenerateSerialNumber) and inserts the claim as NEW; returns its id. Run inside a transaction.</summary>
|
||||
Task<long> InsertClaimAsync(string createdBy, CancellationToken ct = default);
|
||||
Task<int> AttachTripsAsync(long claimId, IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default);
|
||||
|
||||
Task<IReadOnlyList<string>> ClaimTripStatusesAsync(long claimId, CancellationToken ct = default);
|
||||
/// <summary>TRIP_COMPLETE for every trip of the claim: status COMPLETE plus one REFINERY_TRIPS_LOG row each. Returns the number of trips.</summary>
|
||||
Task<int> CompleteClaimTripsAsync(long claimId, string userLogin, long userId, string? ip, CancellationToken ct = default);
|
||||
Task SetClaimStatusAsync(long claimId, string status, string userLogin, CancellationToken ct = default);
|
||||
|
||||
Task<IReadOnlyList<TransferTripRow>> TripsToTransferAsync(long claimId, CancellationToken ct = default);
|
||||
/// <summary>TRIP_STATUS 7 + REFINERY_TRIPS_LOG row TRANSFER_TO_REFINERY. Run inside a transaction.</summary>
|
||||
Task MarkTripTransferredAsync(TransferTripRow trip, long userId, string? ip, CancellationToken ct = default);
|
||||
|
||||
Task AddLogAsync(long claimId, string method, string? oldData, string? newData, long userId, string? ip, CancellationToken ct = default);
|
||||
Task<PagedResult<ClaimLogRowDto>> LogAsync(long claimId, PageRequest page, CancellationToken ct = default);
|
||||
|
||||
Task<IReadOnlyList<WageClaimReportRaw>> ReportRowsAsync(long claimId, CancellationToken ct = default);
|
||||
}
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
namespace NTP.Application.Refinery.WageClaims;
|
||||
|
||||
// ------------------------------------------------------------------ wage claim list / view (REFINERY_WAGE_CLAIM_VIEW)
|
||||
|
||||
public sealed class WageClaimRowDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long? WageClaimNo { get; set; }
|
||||
public DateTime? WageClaimDate { get; set; }
|
||||
public long TripCnt { get; set; }
|
||||
public long? CommissionClaimId { get; set; }
|
||||
public long? CommissionClaimNo { get; set; }
|
||||
/// <summary>NEW / CLOSE / COMPLETE.</summary>
|
||||
public string StatusCode { get; set; } = "";
|
||||
}
|
||||
|
||||
/// <summary>Filters of the legacy grid (WAGE_CLAIM_NO, WAGE_CLAIM_DATE, STATUS_CODE, COMMISSION_CLAIM_NO, HAS_COMMISSION_CLAIM).</summary>
|
||||
public sealed record WageClaimQuery(
|
||||
string? WageClaimNo, DateOnly? WageClaimDate, IReadOnlyList<string> StatusCodes, string? CommissionClaimNo, bool? HasCommissionClaim);
|
||||
|
||||
/// <summary>A trip as shown inside a claim (legacy searchClaimTrips columns) and in the create preview.</summary>
|
||||
public sealed class ClaimTripRowDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Pn { get; set; }
|
||||
public DateTime? PaymentedDate { get; set; }
|
||||
public long? LoadingNo { get; set; }
|
||||
public string? DischargeAuthoriztionNo { get; set; }
|
||||
public DateTime? DischargeEntryDate { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? Trn { get; set; }
|
||||
public string? Nnpn { get; set; }
|
||||
public string StatusCode { get; set; } = "";
|
||||
}
|
||||
|
||||
/// <summary>One row of the log popup (REFINERY_WAGE_CLAIM_LOG_VIEW / REFINERY_COMMISSION_LOG_VIEW).</summary>
|
||||
public sealed class ClaimLogRowDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string MethodName { get; set; } = "";
|
||||
public DateTime? LogDate { get; set; }
|
||||
public string? Login { get; set; }
|
||||
public string? OldData { get; set; }
|
||||
public string? NewData { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Body of POST wage-claims (legacy create: STATUS_CODE list + LOADING_DATE_FROM / TO).</summary>
|
||||
public sealed record CreateWageClaimRequest(IReadOnlyList<string>? StatusCodes, DateOnly? LoadingDateFrom, DateOnly? LoadingDateTo);
|
||||
|
||||
/// <summary>Answer of the write endpoints: the (Arabic) message to toast and the id of the created record.</summary>
|
||||
public sealed record ClaimResult(string Message, long? Id = null);
|
||||
|
||||
// ------------------------------------------------------------------ export
|
||||
|
||||
/// <summary>Raw values of one trip of the claim report (legacy REFINERY_CLAIMS_REPORT_VIEW).</summary>
|
||||
public sealed class WageClaimReportRaw
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Drvr { get; set; }
|
||||
public string? Tn { get; set; }
|
||||
public string? DischargeAuthoriztionNo { get; set; }
|
||||
public long? DischargeAuthoriztionYear { get; set; }
|
||||
public DateTime? DischargeEntryDate { get; set; }
|
||||
public string? ClientNo { get; set; }
|
||||
public long? LoadingNo { get; set; }
|
||||
public DateTime? ActualLoadingDate { get; set; }
|
||||
public decimal? NetLoadingWeight { get; set; }
|
||||
public decimal? WaterAmount { get; set; }
|
||||
public decimal? NetDischargeWeight { get; set; }
|
||||
public decimal? CalculatedQuantityTon { get; set; }
|
||||
public decimal? ToleranceQuantity { get; set; }
|
||||
public decimal? PenaltyQuantity { get; set; }
|
||||
public decimal? TonPrice { get; set; }
|
||||
public decimal? PenaltyAmount { get; set; }
|
||||
public decimal? DriverTip { get; set; }
|
||||
public decimal? PermitDispatch { get; set; }
|
||||
public decimal? WaybillFee { get; set; }
|
||||
public decimal? DieselLiterPrice { get; set; }
|
||||
/// <summary>sum(REFINERY_CARDS_LOG.AMOUNT) of the trip.</summary>
|
||||
public decimal? AdvancePaymentForDiesel { get; set; }
|
||||
public decimal? Commission { get; set; }
|
||||
public decimal? NetWage { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Values of one report line after the legacy sign changes (deductions are shown negative).</summary>
|
||||
public sealed record WageClaimReportLine(
|
||||
string? Drvr, string? Tn, string? DischargeAuthoriztionNo, long? DischargeAuthoriztionYear, DateTime? DischargeEntryDate, string? ClientNo,
|
||||
long? LoadingNo, DateTime? ActualLoadingDate, decimal NetLoadingWeight, decimal WaterAmount, decimal NetDischargeWeight, decimal WeightDifference,
|
||||
decimal CalculatedQuantityTon, decimal ToleranceQuantity, bool WaterExist, decimal PenaltyQuantity, decimal TonPrice, decimal PenaltyAmount,
|
||||
decimal DriverTip, decimal PermitDispatch, decimal WaybillFee, decimal DieselLiterPrice, decimal AdvancePaymentForDiesel, decimal Commission, decimal NetWage);
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
|
||||
namespace NTP.Application.Refinery.WageClaims;
|
||||
|
||||
/// <summary>User-facing texts of the claim screens: the legacy captions (NTP.LT_CAPTION), verbatim.</summary>
|
||||
public static class ClaimMessages
|
||||
{
|
||||
public const string Success = "تمت العملية بنجاح"; // PUBLIC.SUCCESSFUL.OPERATION
|
||||
public const string StatusRequired = "يجب اختيار الحالة"; // ERROR.STATUS_REQUIRED
|
||||
public const string DateRequired = "يجب اختيار التاريخ"; // ERROR.DATE_REQUIRED
|
||||
public const string FromGreaterThanTo = "لا يجوز ان يكون تاريخ من أكبر من تارخ الى"; // ERROR.FROM_CAN_NOT_GREATER_THAN_TO
|
||||
public const string NoTripsNeedWage = "لا يوجد ارساليات جاهزة لانشاء مطالبة مالية"; // ERROR.THERS_IS_NOT_TRIPS_NEED_WAGE
|
||||
public const string CloseClaim = "لا يمكن تسديد هذه المطالبة يوجد ارساليات ضمن المطالبة حالتها جاهز للدفع او تم التفريغ"; // ERROR.CLOSE_CLAIM
|
||||
public const string NoAuthority = "ليس لديك صلاحية لاتمام هذه العملية"; // ERROR.NO_AUTHORITY
|
||||
public const string NoWages = "لا يوجد مطالبات اجور"; // ERROR.THERE_ARE_NO_WAGES
|
||||
public const string PleaseSelectClaim = "يرجى اختيار المطالبة"; // ERROR.PLEASE_SELECT_CLAIM
|
||||
public const string WageClaimNotClose = "لا يمكن تسديد هذه المطالبة يوجد مطالبات اجور غير مسددة"; // ERROR.WAGE_CLAIM_IS_NOT_CLOSE
|
||||
public const string NoTripsIssue = "لا يوجد ارساليات"; // ERROR.NO_TRIPS_THERE_IS_ISSUE
|
||||
public const string CommissionVariableIssue = "يوجد خطأ في تعريف قيمة عمولة الاجور"; // ERROR.REFINERY_VARIABLES_COMMISSION_ISSUE
|
||||
/// <summary>New text (the legacy code had no such case): the Jopetrol integration is switched off by configuration.</summary>
|
||||
public const string JopetrolDisabled = "خدمة الترحيل إلى المصفاة غير مفعلة في هذه البيئة، لم يتم تغيير أي شيء";
|
||||
public const string NotFound = "المطالبة غير موجودة";
|
||||
|
||||
// log captions (method names of the *_LOG tables)
|
||||
public const string StatusNew = "جديد"; // REFINERY_WAGE_CLAIM.STATUSCODE.NEW
|
||||
public const string StatusClose = "تم التسديد"; // ...STATUSCODE.CLOSE
|
||||
public const string StatusComplete = "مكتمل"; // ...STATUSCODE.COMPLETE
|
||||
public const string TripExchanged = "تم الصرف"; // REFINERYTRIP.STATUSCODE.EXCHANGED
|
||||
public const string TripComplete = "مكتمل"; // REFINERYTRIP.STATUSCODE.COMPLETE
|
||||
}
|
||||
|
||||
/// <summary>Pure rules of the wage claim screen (refinery_wage_claimfactory.cfc).</summary>
|
||||
public static class WageClaimRules
|
||||
{
|
||||
public const string New = "NEW";
|
||||
public const string Close = "CLOSE";
|
||||
public const string Complete = "COMPLETE";
|
||||
|
||||
/// <summary>Trip statuses the create dialog offers (REFINERY_WAGE_CLAIMMain.html); trips of other statuses are never attached.</summary>
|
||||
public static readonly IReadOnlyList<string> ClaimableTripStatuses = ["EXCHANGED", "READY_TO_PAY", "DISCHARGED"];
|
||||
|
||||
/// <summary>Distinct upper-case statuses, only the claimable ones (the legacy select-all option "ALL" and unknown values are dropped).</summary>
|
||||
public static IReadOnlyList<string> NormalizeTripStatuses(IEnumerable<string>? raw) =>
|
||||
(raw ?? [])
|
||||
.SelectMany(s => (s ?? "").Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
.Select(s => s.ToUpperInvariant())
|
||||
.Where(s => ClaimableTripStatuses.Contains(s))
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
/// <summary>factory.create: status required, both dates required, from not after to (messages in this order).</summary>
|
||||
public static void ValidateCreate(IReadOnlyList<string> statuses, DateOnly? from, DateOnly? to)
|
||||
{
|
||||
if (statuses.Count == 0) throw new BusinessException("STATUS_REQUIRED", ClaimMessages.StatusRequired);
|
||||
if (from is null || to is null) throw new BusinessException("DATE_REQUIRED", ClaimMessages.DateRequired);
|
||||
if (from.Value > to.Value) throw new BusinessException("FROM_GREATER_THAN_TO", ClaimMessages.FromGreaterThanTo);
|
||||
}
|
||||
|
||||
/// <summary>factory.CLAIM_CLOSE: a claim is paid only when it has trips and every one of them is EXCHANGED.</summary>
|
||||
public static bool CanCloseClaim(IEnumerable<string> tripStatuses)
|
||||
{
|
||||
var distinct = tripStatuses.Distinct().ToList();
|
||||
return distinct.Count == 1 && distinct[0] == "EXCHANGED";
|
||||
}
|
||||
|
||||
/// <summary>factory.TRANSFER: the Jopetrol answer must contain this text (findNoCase) for the trip to move to TRIP_STATUS 7.</summary>
|
||||
public static bool IsStatus7Success(string? serviceAnswer) =>
|
||||
serviceAnswer is not null && serviceAnswer.Contains("Status Updated successfully To 7", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
/// <summary>Last day (inclusive) of a [from, to] day range as an exclusive upper bound (legacy: between FROM000000 and TO235959).</summary>
|
||||
public static DateTime ExclusiveEnd(DateOnly to) => to.AddDays(1).ToDateTime(TimeOnly.MinValue);
|
||||
|
||||
/// <summary>
|
||||
/// Report line of one trip, as legacy factoryweb.report prepares it: the deductions (driver tip, permit dispatch, waybill fee, diesel liter price,
|
||||
/// diesel advance when > 0, commission) are multiplied by -1; the penalty quantity is 0 when the weight difference is below the tolerance
|
||||
/// (REFINERY_CLAIMS_REPORT_VIEW).
|
||||
/// </summary>
|
||||
public static WageClaimReportLine ToReportLine(WageClaimReportRaw r)
|
||||
{
|
||||
decimal V(decimal? d) => d ?? 0m;
|
||||
var diff = V(r.NetLoadingWeight) - V(r.NetDischargeWeight);
|
||||
var penaltyQty = diff < V(r.ToleranceQuantity) ? 0m : V(r.PenaltyQuantity);
|
||||
var advance = V(r.AdvancePaymentForDiesel);
|
||||
return new WageClaimReportLine(
|
||||
r.Drvr, r.Tn, r.DischargeAuthoriztionNo, r.DischargeAuthoriztionYear, r.DischargeEntryDate, r.ClientNo,
|
||||
r.LoadingNo, r.ActualLoadingDate, V(r.NetLoadingWeight), V(r.WaterAmount), V(r.NetDischargeWeight), diff,
|
||||
V(r.CalculatedQuantityTon), V(r.ToleranceQuantity), V(r.WaterAmount) > 0, penaltyQty, V(r.TonPrice), V(r.PenaltyAmount),
|
||||
-V(r.DriverTip), -V(r.PermitDispatch), -V(r.WaybillFee), -V(r.DieselLiterPrice),
|
||||
advance > 0 ? -advance : advance, -V(r.Commission), V(r.NetWage));
|
||||
}
|
||||
|
||||
/// <summary>Caption of a claim status (REFINERY_WAGE_CLAIM.STATUS.* / REFINERY_COMMISSION_CLAIM.STATUS.*).</summary>
|
||||
public static string ClaimStatusCaption(string? code) => code switch
|
||||
{
|
||||
New => ClaimMessages.StatusNew,
|
||||
Close => ClaimMessages.StatusClose,
|
||||
Complete => ClaimMessages.StatusComplete,
|
||||
_ => code ?? "",
|
||||
};
|
||||
}
|
||||
|
|
@ -1,160 +0,0 @@
|
|||
using System.Text.Encodings.Web;
|
||||
using System.Text.Json;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
|
||||
namespace NTP.Application.Refinery.WageClaims;
|
||||
|
||||
/// <summary>JSON of the OLD_DATA / NEW_DATA columns of the *_LOG tables: <c>{"STATUS_CODE":"..."}</c> with real (unescaped) Arabic, as legacy logs.saveLog.</summary>
|
||||
public static class ClaimLogJson
|
||||
{
|
||||
private static readonly JsonSerializerOptions Opts = new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
|
||||
public static string Status(string caption) => JsonSerializer.Serialize(new Dictionary<string, string> { ["STATUS_CODE"] = caption }, Opts);
|
||||
}
|
||||
|
||||
public interface IWageClaimService
|
||||
{
|
||||
Task<PagedResult<WageClaimRowDto>> SearchAsync(WageClaimQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<WageClaimRowDto> GetAsync(long id, CancellationToken ct);
|
||||
Task<PagedResult<ClaimTripRowDto>> TripsAsync(long id, PageRequest page, CancellationToken ct);
|
||||
Task<PagedResult<ClaimTripRowDto>> CandidateTripsAsync(IReadOnlyList<string>? statusCodes, DateOnly? from, DateOnly? to, PageRequest page, CancellationToken ct);
|
||||
Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct);
|
||||
Task<ClaimResult> CreateAsync(CreateWageClaimRequest request, string? ip, CancellationToken ct);
|
||||
Task<ClaimResult> CloseAsync(long id, string? ip, CancellationToken ct);
|
||||
Task<ClaimResult> TransferAsync(long id, string? ip, CancellationToken ct);
|
||||
Task<ExportFile> ExportAsync(long id, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinery_wage_claimfactory.cfc. Who may do what is decided by the permission keys on the controller
|
||||
/// (PermissionKeys.RefineryWageClaims*), not by the legacy role branches.
|
||||
/// </summary>
|
||||
public sealed class WageClaimService(IWageClaimRepository repo, IUnitOfWork unit, IJopetrolGateway jopetrol, ICurrentUser user) : IWageClaimService
|
||||
{
|
||||
public Task<PagedResult<WageClaimRowDto>> SearchAsync(WageClaimQuery query, PageRequest page, CancellationToken ct) => repo.SearchAsync(query, page, ct);
|
||||
|
||||
public async Task<WageClaimRowDto> GetAsync(long id, CancellationToken ct) =>
|
||||
await repo.GetAsync(id, ct) ?? throw new NotFoundException("REFINERY_WAGE_CLAIM", id);
|
||||
|
||||
public async Task<PagedResult<ClaimTripRowDto>> TripsAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
await GetAsync(id, ct);
|
||||
return await repo.ClaimTripsAsync(id, page, ct);
|
||||
}
|
||||
|
||||
public Task<PagedResult<ClaimTripRowDto>> CandidateTripsAsync(IReadOnlyList<string>? statusCodes, DateOnly? from, DateOnly? to, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
// legacy searchClaimTrips: no status = the three statuses of the dialog; from after to is refused
|
||||
var statuses = WageClaimRules.NormalizeTripStatuses(statusCodes);
|
||||
if (statuses.Count == 0) statuses = WageClaimRules.ClaimableTripStatuses;
|
||||
if (from is not null && to is not null && from.Value > to.Value) throw new BusinessException("FROM_GREATER_THAN_TO", ClaimMessages.FromGreaterThanTo);
|
||||
return repo.CandidateTripsAsync(statuses, from, to, page, ct);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
await GetAsync(id, ct);
|
||||
return await repo.LogAsync(id, page, ct);
|
||||
}
|
||||
|
||||
/// <summary>factory.create: attaches the trips of the chosen statuses and loading dates that have no wage claim to a new NEW claim.</summary>
|
||||
public async Task<ClaimResult> CreateAsync(CreateWageClaimRequest request, string? ip, CancellationToken ct)
|
||||
{
|
||||
var statuses = WageClaimRules.NormalizeTripStatuses(request.StatusCodes);
|
||||
WageClaimRules.ValidateCreate(statuses, request.LoadingDateFrom, request.LoadingDateTo);
|
||||
var from = request.LoadingDateFrom!.Value;
|
||||
var to = request.LoadingDateTo!.Value;
|
||||
|
||||
var id = await unit.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
if (await repo.CountCandidateTripsAsync(statuses, from, to, c) == 0)
|
||||
throw new BusinessException("NO_TRIPS_NEED_WAGE", ClaimMessages.NoTripsNeedWage);
|
||||
var claimId = await repo.InsertClaimAsync(user.UserId, c);
|
||||
await repo.AttachTripsAsync(claimId, statuses, from, to, c);
|
||||
await repo.AddLogAsync(claimId, "CREATE", "{}", ClaimLogJson.Status(WageClaimRules.New), user.Id, ip, c);
|
||||
return claimId;
|
||||
}, ct);
|
||||
return new ClaimResult(ClaimMessages.Success, id);
|
||||
}
|
||||
|
||||
/// <summary>factory.CLAIM_CLOSE (تسديد): NEW claim whose trips are all EXCHANGED -> trips COMPLETE (+ trip log), claim CLOSE (+ log).</summary>
|
||||
public async Task<ClaimResult> CloseAsync(long id, string? ip, CancellationToken ct)
|
||||
{
|
||||
var claim = await GetAsync(id, ct);
|
||||
if (claim.StatusCode != WageClaimRules.New) throw new BusinessException("NO_AUTHORITY", ClaimMessages.NoAuthority);
|
||||
if (!WageClaimRules.CanCloseClaim(await repo.ClaimTripStatusesAsync(id, ct)))
|
||||
throw new BusinessException("CLOSE_CLAIM", ClaimMessages.CloseClaim);
|
||||
|
||||
await unit.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
await repo.CompleteClaimTripsAsync(id, user.UserId, user.Id, ip, c);
|
||||
await repo.SetClaimStatusAsync(id, WageClaimRules.Close, user.UserId, c);
|
||||
await repo.AddLogAsync(id, "CLAIM_CLOSE", ClaimLogJson.Status(ClaimMessages.StatusNew), ClaimLogJson.Status(ClaimMessages.StatusClose), user.Id, ip, c);
|
||||
return 0;
|
||||
}, ct);
|
||||
return new ClaimResult(ClaimMessages.Success, id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// factory.TRANSFER (ترحيل): each trip of the claim with TRIP_STATUS 6 is sent to Jopetrol; when the service answers "Status Updated successfully To 7"
|
||||
/// the trip gets TRIP_STATUS 7 and a TRANSFER_TO_REFINERY log row. When the integration is disabled nothing is called and nothing is changed.
|
||||
/// </summary>
|
||||
public async Task<ClaimResult> TransferAsync(long id, string? ip, CancellationToken ct)
|
||||
{
|
||||
var claim = await GetAsync(id, ct);
|
||||
if (claim.StatusCode != WageClaimRules.New) throw new BusinessException("NO_AUTHORITY", ClaimMessages.NoAuthority);
|
||||
|
||||
var trips = await repo.TripsToTransferAsync(id, ct);
|
||||
var sent = 0;
|
||||
foreach (var trip in trips)
|
||||
{
|
||||
string? answer;
|
||||
try
|
||||
{
|
||||
answer = await jopetrol.SendClaimAndUpdateStatusTo7Async(trip.Pn ?? "", claim.WageClaimNo?.ToString(System.Globalization.CultureInfo.InvariantCulture) ?? "", ct);
|
||||
}
|
||||
catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException or InvalidOperationException or System.Xml.XmlException)
|
||||
{
|
||||
// the service is down: stop here, what was already moved stays moved
|
||||
throw new BusinessException("JOPETROL_FAILED", $"تعذر الاتصال بخدمة المصفاة، تم ترحيل {sent} من {trips.Count} ارسالية");
|
||||
}
|
||||
if (answer is null) throw new BusinessException("JOPETROL_DISABLED", ClaimMessages.JopetrolDisabled);
|
||||
if (!WageClaimRules.IsStatus7Success(answer)) continue;
|
||||
|
||||
await unit.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
await repo.MarkTripTransferredAsync(trip, user.Id, ip, c);
|
||||
return 0;
|
||||
}, ct);
|
||||
sent++;
|
||||
}
|
||||
return new ClaimResult(sent == trips.Count ? ClaimMessages.Success : $"تم ترحيل {sent} من {trips.Count} ارسالية", id);
|
||||
}
|
||||
|
||||
/// <summary>factoryweb.report: the trips of the claim with the amounts, deductions shown negative (column list of the legacy report).</summary>
|
||||
public async Task<ExportFile> ExportAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var claim = await GetAsync(id, ct);
|
||||
var lines = (await repo.ReportRowsAsync(id, ct)).Select(WageClaimRules.ToReportLine).ToList();
|
||||
string[] headers =
|
||||
[
|
||||
"متسلسل", "اسم السائق", "رقم الشاحنة", "رقم النموذج", "السنة", "تاريخ النموذج", "رقم الناقل الفرعي", "اسم الناقل الفرعي", "رقم البوليصة",
|
||||
"تاريخ البوليصة", "كمية البوليصة", "كمية الماء (كغم)", "كمية المصفاة (كغم)", "الفروقات", "الكمية المحسوبة طن", "كمية السماح", "الماء المصاحب",
|
||||
"كمية التغريم (كغم)", "سعر الطن", "خصم قيمة فرق كمية مغرمة", "اكرامية السائق", "خصم تسريب الصهريج", "خصم اصدار وثيقة", "سعر لتر دينار/لتر",
|
||||
"خصم قيمة 350 لتر ديزل", "خصم عمولة الصرف التنافسي", "صافي قيمة الصرف الفعلي",
|
||||
];
|
||||
var i = 0;
|
||||
var rows = lines.Select(l => new object?[]
|
||||
{
|
||||
++i, l.Drvr, l.Tn, l.DischargeAuthoriztionNo, l.DischargeAuthoriztionYear, ClaimExcel.D(l.DischargeEntryDate), l.ClientNo, "", l.LoadingNo,
|
||||
ClaimExcel.D(l.ActualLoadingDate), ClaimExcel.N(l.NetLoadingWeight), ClaimExcel.N(l.WaterAmount), ClaimExcel.N(l.NetDischargeWeight),
|
||||
ClaimExcel.N(l.WeightDifference), ClaimExcel.N(l.CalculatedQuantityTon), ClaimExcel.N(l.ToleranceQuantity), l.WaterExist ? "نعم" : "لا",
|
||||
ClaimExcel.N(l.PenaltyQuantity), ClaimExcel.N(l.TonPrice), ClaimExcel.N(l.PenaltyAmount), ClaimExcel.N(l.DriverTip), ClaimExcel.N(l.PermitDispatch),
|
||||
ClaimExcel.N(l.WaybillFee), ClaimExcel.N(l.DieselLiterPrice), ClaimExcel.N(l.AdvancePaymentForDiesel), ClaimExcel.N(l.Commission), ClaimExcel.N(l.NetWage),
|
||||
});
|
||||
return ClaimExcel.Build("شاشة مطالبات صرف أجور النقل",
|
||||
[$"رقم مطالبة اجور النقل : {claim.WageClaimNo}"], headers, rows, user.UserId, $"wage_claim_{claim.WageClaimNo}");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
using FluentValidation;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
|
||||
namespace NTP.Application.Refinery.Wallets;
|
||||
|
||||
public interface IWalletsRepository
|
||||
{
|
||||
/// <summary>Oldest first (legacy sort ID ASC).</summary>
|
||||
Task<PagedResult<WalletRow>> SearchAsync(WalletsQuery query, PageRequest page, CancellationToken ct = default);
|
||||
Task<WalletRow?> GetAsync(long id, CancellationToken ct = default);
|
||||
/// <summary>Ids of the ACTIVE records of a truck.</summary>
|
||||
Task<IReadOnlyList<long>> GetActiveIdsByTruckAsync(long tn, CancellationToken ct = default);
|
||||
/// <summary>Ids of the ACTIVE records of a driver (national number).</summary>
|
||||
Task<IReadOnlyList<long>> GetActiveIdsByDriverAsync(long nnpn, CancellationToken ct = default);
|
||||
Task<long> InsertAsync(WalletWrite record, string createdBy, CancellationToken ct = default);
|
||||
Task SetStatusAsync(long id, string status, string userId, CancellationToken ct = default);
|
||||
Task InsertLogAsync(long entityId, string method, string userId, string? userIp, string oldData, string newData, CancellationToken ct = default);
|
||||
Task<PagedResult<WalletLogRow>> GetLogAsync(long entityId, PageRequest page, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
public interface IWalletsService
|
||||
{
|
||||
Task<PagedResult<WalletRow>> SearchAsync(WalletsQuery query, PageRequest page, CancellationToken ct);
|
||||
Task<WalletDetail> GetAsync(long id, CancellationToken ct);
|
||||
Task<PagedResult<WalletLogRow>> GetLogAsync(long id, PageRequest page, CancellationToken ct);
|
||||
Task<WalletsResult> CreateAsync(SaveWalletRequest request, string? userIp, CancellationToken ct);
|
||||
Task<WalletsResult> UpdateAsync(long id, SaveWalletRequest request, string? userIp, CancellationToken ct);
|
||||
Task<WalletsResult> ActivateAsync(long id, string? userIp, CancellationToken ct);
|
||||
Task<WalletsResult> DeactivateAsync(long id, string? userIp, CancellationToken ct);
|
||||
Task<ExportFile> ExportAsync(WalletsQuery query, CancellationToken ct);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The form of REFINERY_WALLET.js: required fields per payment method, mobile / bank account / digits formats. Stricter than legacy in two places
|
||||
/// only: the truck number (WALLET, BANK) and the wallet number (WALLET, DRIVER_TIP) are required, because the duplicate rule and the payment
|
||||
/// need them (every stored record has them).
|
||||
/// </summary>
|
||||
public sealed class SaveWalletValidator : AbstractValidator<SaveWalletRequest>
|
||||
{
|
||||
public SaveWalletValidator()
|
||||
{
|
||||
RuleFor(x => x.PaymentMethod).Must(m => m is WalletValues.MethodWallet or WalletValues.MethodBank or WalletValues.MethodDriverTip)
|
||||
.WithMessage(WalletsMessages.Required);
|
||||
|
||||
When(x => x.PaymentMethod is WalletValues.MethodWallet or WalletValues.MethodBank, () =>
|
||||
{
|
||||
RuleFor(x => x.Tn).Must(v => WalletsRules.IsDigits(v?.Trim(), 10)).WithMessage(WalletsMessages.Required);
|
||||
RuleFor(x => x.OwnerName).NotEmpty().MaximumLength(450).WithMessage(WalletsMessages.Required);
|
||||
RuleFor(x => x.OwnerNnpn).Must(v => string.IsNullOrWhiteSpace(v) || WalletsRules.IsDigits(v.Trim(), 15)).WithMessage(WalletsMessages.NumbersOnly);
|
||||
});
|
||||
|
||||
When(x => x.PaymentMethod == WalletValues.MethodWallet, () =>
|
||||
{
|
||||
RuleFor(x => x.WalletNumber).NotEmpty().WithMessage(WalletsMessages.Required)
|
||||
.Must(v => WalletsRules.IsMobile(v?.Trim())).WithMessage(WalletsMessages.WrongMobile);
|
||||
});
|
||||
|
||||
When(x => x.PaymentMethod == WalletValues.MethodBank, () =>
|
||||
{
|
||||
RuleFor(x => x.Iban).NotEmpty().MaximumLength(50).WithMessage(WalletsMessages.Required);
|
||||
RuleFor(x => x.BankAccount).NotEmpty().MaximumLength(50).WithMessage(WalletsMessages.Required)
|
||||
.Must(v => WalletsRules.IsBankAccount(v?.Trim())).WithMessage(WalletsMessages.WrongBankAccount);
|
||||
RuleFor(x => x.BankName).MaximumLength(300);
|
||||
RuleFor(x => x.BankBranch).MaximumLength(50);
|
||||
RuleFor(x => x.OwnerNameEnglish).MaximumLength(150);
|
||||
});
|
||||
|
||||
When(x => x.PaymentMethod == WalletValues.MethodDriverTip, () =>
|
||||
{
|
||||
RuleFor(x => x.DriverName).NotEmpty().MaximumLength(450).WithMessage(WalletsMessages.Required);
|
||||
RuleFor(x => x.DriverNnpn).Must(v => WalletsRules.IsDigits(v?.Trim(), 15)).WithMessage(WalletsMessages.Required);
|
||||
RuleFor(x => x.WalletNumber).NotEmpty().WithMessage(WalletsMessages.Required)
|
||||
.Must(v => WalletsRules.IsMobile(v?.Trim())).WithMessage(WalletsMessages.WrongMobile);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
namespace NTP.Application.Refinery.Wallets;
|
||||
|
||||
/// <summary>
|
||||
/// Row of REFINERY_WALLET: how a truck owner (or a driver, for the tip) gets paid: e-wallet, bank transfer or driver wallet. Same columns as the legacy
|
||||
/// REFINERY_WALLET_VIEW (OwnerNnpn / OwnerName fall back to the driver's when the owner's are empty). Class with settable properties.
|
||||
/// </summary>
|
||||
public class WalletRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long? Tn { get; set; }
|
||||
public long? CompanyCode { get; set; }
|
||||
/// <summary>0 = bank transfer, 1 = e-wallet (also the driver wallet). Legacy EPAYMENT.</summary>
|
||||
public int Epayment { get; set; }
|
||||
/// <summary>Stored OWNER_NNPN (empty for a driver wallet).</summary>
|
||||
public long? OwnerNnpn { get; set; }
|
||||
public string? WalletNumber { get; set; }
|
||||
/// <summary>Stored OWNER_NAME (empty for a driver wallet).</summary>
|
||||
public string? OwnerName { get; set; }
|
||||
/// <summary>What the legacy grid shows as national no.: the owner's, else the driver's (view column OWNER_NNPN / NNPN).</summary>
|
||||
public long? HolderNnpn { get; set; }
|
||||
/// <summary>What the legacy grid shows as owner name: the owner's, else the driver's (view column OWNER_NAME).</summary>
|
||||
public string? HolderName { get; set; }
|
||||
public string? OwnerNameEnglish { get; set; }
|
||||
public string? DriverName { get; set; }
|
||||
public long? DriverNnpn { get; set; }
|
||||
public string? Iban { get; set; }
|
||||
public string? BankAccount { get; set; }
|
||||
public string? BankName { get; set; }
|
||||
public string? BankBranch { get; set; }
|
||||
public DateTime? CreationDate { get; set; }
|
||||
public string? CreatedBy { get; set; }
|
||||
public DateTime? UpdateDate { get; set; }
|
||||
public string? UpdatedBy { get; set; }
|
||||
public string? StatusCode { get; set; }
|
||||
/// <summary>BANK, EWALLET or DRAIVER_WALLET (legacy view spelling): the kind of the record, see <see cref="WalletValues"/>.</summary>
|
||||
public string? PaymentMethod { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>One record plus what may be done with it.</summary>
|
||||
public sealed class WalletDetail : WalletRow
|
||||
{
|
||||
/// <summary>ACTIVE record: edit (deactivates it and creates a new one).</summary>
|
||||
public bool CanUpdate { get; set; }
|
||||
public bool CanDeactivate { get; set; }
|
||||
/// <summary>INACTIVE record and the truck / driver has no other ACTIVE record (legacy getREFINERY_WALLET sets ACTIONS = ACTIVATE).</summary>
|
||||
public bool CanActivate { get; set; }
|
||||
}
|
||||
|
||||
public class WalletLogRow
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public long EntityId { get; set; }
|
||||
public string? MethodName { get; set; }
|
||||
public string? Login { get; set; }
|
||||
public DateTime? LogDate { get; set; }
|
||||
public string? UserId { get; set; }
|
||||
public string? UserIp { get; set; }
|
||||
/// <summary>JSON text (property name -> value); legacy rows may hold one-element arrays as values.</summary>
|
||||
public string? OldData { get; set; }
|
||||
public string? NewData { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Grid filters: tn, walletNumber, bankAccount, nnpn, paymentMethod, statusCode exact; ownerName contains.</summary>
|
||||
public sealed record WalletsQuery(string? Tn, string? WalletNumber, string? OwnerName, string? BankAccount, string? PaymentMethod, string? StatusCode, string? Nnpn);
|
||||
|
||||
/// <summary>
|
||||
/// Create / update body. <see cref="PaymentMethod"/> WALLET (e-wallet of a truck), BANK (bank transfer of a truck) or DRIVER_TIP (driver wallet).
|
||||
/// Fields not used by the chosen method are ignored. Numbers travel as text (digits only).
|
||||
/// </summary>
|
||||
public sealed class SaveWalletRequest
|
||||
{
|
||||
public string? PaymentMethod { get; set; }
|
||||
/// <summary>WALLET / BANK: truck number.</summary>
|
||||
public string? Tn { get; set; }
|
||||
/// <summary>WALLET / BANK: national number of the owner (optional).</summary>
|
||||
public string? OwnerNnpn { get; set; }
|
||||
/// <summary>WALLET / DRIVER_TIP: mobile number of the wallet (07xxxxxxxx or 7xxxxxxxx, 77/78/79).</summary>
|
||||
public string? WalletNumber { get; set; }
|
||||
/// <summary>WALLET / BANK: account owner.</summary>
|
||||
public string? OwnerName { get; set; }
|
||||
public string? OwnerNameEnglish { get; set; }
|
||||
public string? BankName { get; set; }
|
||||
public string? BankBranch { get; set; }
|
||||
public string? Iban { get; set; }
|
||||
public string? BankAccount { get; set; }
|
||||
/// <summary>DRIVER_TIP.</summary>
|
||||
public string? DriverName { get; set; }
|
||||
public string? DriverNnpn { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>Normalised record to insert (what the legacy factory builds into the bean per payment method).</summary>
|
||||
public sealed record WalletWrite(
|
||||
int Epayment, long? Tn, long? OwnerNnpn, string? WalletNumber, string? OwnerName, string? OwnerNameEnglish,
|
||||
long? DriverNnpn, string? DriverName, string? Iban, string? BankAccount, string? BankName, string? BankBranch);
|
||||
|
||||
public sealed record WalletsResult(string Message, long? Id = null);
|
||||
|
||||
public static class WalletValues
|
||||
{
|
||||
public const string Active = "ACTIVE";
|
||||
public const string Inactive = "INACTIVE";
|
||||
|
||||
// request codes (the select of the legacy form)
|
||||
public const string MethodWallet = "WALLET";
|
||||
public const string MethodBank = "BANK";
|
||||
public const string MethodDriverTip = "DRIVER_TIP";
|
||||
|
||||
// kinds of a stored record (legacy REFINERY_WALLET_VIEW.PAYMENT_METHOD, spelling kept)
|
||||
public const string KindBank = "BANK";
|
||||
public const string KindEWallet = "EWALLET";
|
||||
public const string KindDriverWallet = "DRAIVER_WALLET";
|
||||
|
||||
// log METHOD_NAME values
|
||||
public const string LogCreate = "CREATE";
|
||||
public const string LogUpdate = "UPDATE";
|
||||
public const string LogActivate = "ACTIVATE";
|
||||
public const string LogDeactivate = "DEACTIVATE";
|
||||
}
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
using System.Text.Encodings.Web;
|
||||
using System.Text.Json;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace NTP.Application.Refinery.Wallets;
|
||||
|
||||
/// <summary>User-facing texts (legacy captions verbatim; * = no row in LT_CAPTION, new wording).</summary>
|
||||
public static class WalletsMessages
|
||||
{
|
||||
public const string Required = "الرجاء ادخال جميع الحقول"; // REPORT.VALIDATION
|
||||
public const string WrongMobile = "رقم المحفظة غير صحيح"; // PUBLIC.WRONG_MOBILE_NUMBER
|
||||
public const string WrongBankAccount = "رقم الحساب غير صحيح مسموح بالارقام والاحرف وال / فقط"; // VAILD.LETTERS_NYMBERS_SLASH_ONLY
|
||||
public const string NumbersOnly = "الحقل لا يقبل أحرف"; // PUBLIC.NUMBERSONLY
|
||||
public const string TruckHasActive = "رقم الشاحنة المدخل له آلية صرف فعالة"; // TRUCK_ALREADY_HAS_ACTIVE_RECORD
|
||||
public const string DriverHasActive = "الرقم الوطني المدخل له آلية صرف فعالة"; // DRIVER_ALREADY_HAS_ACTIVE_RECORD
|
||||
public const string NotFound = "آلية الصرف غير موجودة"; // *
|
||||
public const string StatusNotAllowed = "لا يمكن تنفيذ هذا الإجراء على السجل في حالته الحالية"; // * (legacy: STATUS_ACTION_MATRIX refusal)
|
||||
public const string Done = "";
|
||||
}
|
||||
|
||||
public static class WalletsErrors
|
||||
{
|
||||
public const string TruckHasActive = "TRUCK_ALREADY_HAS_ACTIVE_RECORD";
|
||||
public const string DriverHasActive = "DRIVER_ALREADY_HAS_ACTIVE_RECORD";
|
||||
public const string NotFound = "REFINERY_WALLET_NOT_FOUND";
|
||||
public const string StatusNotAllowed = "REFINERY_WALLET_STATUS_NOT_ALLOWED";
|
||||
}
|
||||
|
||||
/// <summary>Pure rules of refinery_walletfactory.cfc and the checks of REFINERY_WALLET.js.</summary>
|
||||
public static partial class WalletsRules
|
||||
{
|
||||
// REFINERY_WALLET.js createRefineryWallet: ^(07){1}[7-9]{1}[0-9]{7}$ or ^(7){1}[7-9]{1}[0-9]{7}$
|
||||
[GeneratedRegex(@"^0?7[7-9][0-9]{7}$")]
|
||||
private static partial Regex MobileRegex();
|
||||
// ^[//a-zA-Z 0-9]*$
|
||||
[GeneratedRegex(@"^[/a-zA-Z 0-9]*$")]
|
||||
private static partial Regex BankAccountRegex();
|
||||
[GeneratedRegex(@"^\d+$")]
|
||||
private static partial Regex DigitsRegex();
|
||||
|
||||
public static bool IsMobile(string? v) => v is not null && MobileRegex().IsMatch(v);
|
||||
public static bool IsBankAccount(string? v) => v is not null && BankAccountRegex().IsMatch(v);
|
||||
public static bool IsDigits(string? v, int max) => v is not null && v.Length <= max && DigitsRegex().IsMatch(v);
|
||||
|
||||
private static string? Clean(string? v) => string.IsNullOrWhiteSpace(v) ? null : v.Trim();
|
||||
private static long? ToLong(string? v) => Clean(v) is { } s && long.TryParse(s, out var n) ? n : null;
|
||||
|
||||
/// <summary>
|
||||
/// What the legacy factory copies into the bean for each payment method (refinery_walletfactory.cfc:67-95): BANK = EPAYMENT 0 with the
|
||||
/// bank data; WALLET = EPAYMENT 1 with the wallet number; DRIVER_TIP = EPAYMENT 1, driver data only, no truck. Fields that belong to another
|
||||
/// method are dropped (the DB defaults then give '-' for IBAN, BANK_ACCOUNT and BANK_NAME).
|
||||
/// </summary>
|
||||
public static WalletWrite ToWrite(SaveWalletRequest r) => r.PaymentMethod switch
|
||||
{
|
||||
WalletValues.MethodBank => new WalletWrite(0, ToLong(r.Tn), ToLong(r.OwnerNnpn), null, Clean(r.OwnerName), Clean(r.OwnerNameEnglish),
|
||||
null, null, Clean(r.Iban), Clean(r.BankAccount), Clean(r.BankName), Clean(r.BankBranch)),
|
||||
WalletValues.MethodWallet => new WalletWrite(1, ToLong(r.Tn), ToLong(r.OwnerNnpn), Clean(r.WalletNumber), Clean(r.OwnerName), null,
|
||||
null, null, null, null, null, null),
|
||||
_ => new WalletWrite(1, null, null, Clean(r.WalletNumber), null, null, ToLong(r.DriverNnpn), Clean(r.DriverName), null, null, null, null),
|
||||
};
|
||||
|
||||
/// <summary>The payment method code of the form for a stored record (a bank record has EPAYMENT 0, a driver record has no truck).</summary>
|
||||
public static string MethodOf(WalletRow w) =>
|
||||
w.Epayment == 0 ? WalletValues.MethodBank : w.Tn is null && w.DriverNnpn is not null ? WalletValues.MethodDriverTip : WalletValues.MethodWallet;
|
||||
|
||||
// ------------------------------------------------------------------ log JSON (aqabaTCSBCommon.logs.saveLog)
|
||||
|
||||
private static readonly JsonSerializerOptions Json = new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
|
||||
|
||||
public static string ToJson(IReadOnlyDictionary<string, string> values) => JsonSerializer.Serialize(values, Json);
|
||||
|
||||
public static string EmptyJson => "{}";
|
||||
|
||||
/// <summary>CREATE log of a new record (legacy: only {"STATUS_CODE":"ACTIVE"} when created from the form).</summary>
|
||||
public static string CreateNewData() => ToJson(new Dictionary<string, string> { ["STATUS_CODE"] = "ACTIVE" });
|
||||
|
||||
/// <summary>
|
||||
/// CREATE log of the record that replaces an updated one: the whole bean (system columns empty, as legacy), keys upper-case.
|
||||
/// </summary>
|
||||
public static string ReplacementNewData(WalletWrite w, string createdBy) => ToJson(new Dictionary<string, string>
|
||||
{
|
||||
["TN"] = w.Tn?.ToString() ?? "", ["COMPANY_CODE"] = "", ["EPAYMENT"] = w.Epayment.ToString(),
|
||||
["OWNER_NNPN"] = w.OwnerNnpn?.ToString() ?? "", ["WALLET_NUMBER"] = w.WalletNumber ?? "", ["OWNER_NAME"] = w.OwnerName ?? "",
|
||||
["CREATION_DATE"] = "", ["DRIVER_NAME"] = w.DriverName ?? "", ["DRIVER_NNPN"] = w.DriverNnpn?.ToString() ?? "",
|
||||
["IBAN"] = w.Iban ?? "-", ["BANK_ACCOUNT"] = w.BankAccount ?? "-", ["BANK_NAME"] = w.BankName ?? "-", ["CREATED_BY"] = createdBy,
|
||||
["UPDATE_DATE"] = "", ["UPDATED_BY"] = "", ["STATUS_CODE"] = "", ["BANK_BRANCH"] = w.BankBranch ?? "",
|
||||
["OWNER_NAME_ENGLISH"] = w.OwnerNameEnglish ?? "",
|
||||
});
|
||||
|
||||
/// <summary>The data columns the UPDATE log compares (legacy: the bean columns that also exist in the old record, minus system columns).</summary>
|
||||
public static IReadOnlyDictionary<string, string> DataColumns(WalletRow w) => new Dictionary<string, string>
|
||||
{
|
||||
["TN"] = w.Tn?.ToString() ?? "", ["EPAYMENT"] = w.Epayment.ToString(),
|
||||
["OWNER_NNPN"] = w.OwnerNnpn?.ToString() ?? "", ["WALLET_NUMBER"] = w.WalletNumber ?? "", ["OWNER_NAME"] = w.OwnerName ?? "",
|
||||
["DRIVER_NAME"] = w.DriverName ?? "", ["DRIVER_NNPN"] = w.DriverNnpn?.ToString() ?? "",
|
||||
["IBAN"] = w.Iban ?? "", ["BANK_ACCOUNT"] = w.BankAccount ?? "", ["BANK_NAME"] = w.BankName ?? "",
|
||||
["BANK_BRANCH"] = w.BankBranch ?? "", ["OWNER_NAME_ENGLISH"] = w.OwnerNameEnglish ?? "",
|
||||
};
|
||||
|
||||
public static IReadOnlyDictionary<string, string> DataColumns(WalletWrite w) => new Dictionary<string, string>
|
||||
{
|
||||
["TN"] = w.Tn?.ToString() ?? "", ["EPAYMENT"] = w.Epayment.ToString(),
|
||||
["OWNER_NNPN"] = w.OwnerNnpn?.ToString() ?? "", ["WALLET_NUMBER"] = w.WalletNumber ?? "", ["OWNER_NAME"] = w.OwnerName ?? "",
|
||||
["DRIVER_NAME"] = w.DriverName ?? "", ["DRIVER_NNPN"] = w.DriverNnpn?.ToString() ?? "",
|
||||
["IBAN"] = w.Iban ?? "-", ["BANK_ACCOUNT"] = w.BankAccount ?? "-", ["BANK_NAME"] = w.BankName ?? "-",
|
||||
["BANK_BRANCH"] = w.BankBranch ?? "", ["OWNER_NAME_ENGLISH"] = w.OwnerNameEnglish ?? "",
|
||||
};
|
||||
|
||||
/// <summary>UPDATE log of the replaced record: only the columns whose value changed, old and new (null when nothing changed).</summary>
|
||||
public static (string OldData, string NewData)? Diff(WalletRow old, WalletWrite updated)
|
||||
{
|
||||
var before = DataColumns(old);
|
||||
var after = DataColumns(updated);
|
||||
var o = new Dictionary<string, string>();
|
||||
var n = new Dictionary<string, string>();
|
||||
foreach (var (key, b) in before)
|
||||
if (!string.Equals(b, after[key], StringComparison.OrdinalIgnoreCase)) { o[key] = b; n[key] = after[key]; }
|
||||
return o.Count == 0 ? null : (ToJson(o), ToJson(n));
|
||||
}
|
||||
|
||||
/// <summary>Caption of REFINERY_WALLET.STATUSCODE.* (logs.saveLog translates STATUS_CODE).</summary>
|
||||
public static string StatusCaption(string status) =>
|
||||
string.Equals(status, WalletValues.Active, StringComparison.OrdinalIgnoreCase) ? "فعال" : "غير فعال";
|
||||
|
||||
/// <summary>Status change log: old and new caption of STATUS_CODE.</summary>
|
||||
public static (string OldData, string NewData) StatusChange(string from, string to) =>
|
||||
(ToJson(new Dictionary<string, string> { ["STATUS_CODE"] = StatusCaption(from) }),
|
||||
ToJson(new Dictionary<string, string> { ["STATUS_CODE"] = StatusCaption(to) }));
|
||||
}
|
||||
|
|
@ -1,175 +0,0 @@
|
|||
using FluentValidation;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Grains.Orders;
|
||||
using NTP.Application.Grains.Reports;
|
||||
|
||||
namespace NTP.Application.Refinery.Wallets;
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinery_walletfactory.cfc / refinery_walletfactoryweb.cfc (screen REFINERY_WALLET, شاشة طرق الدفع). Access by permission keys only
|
||||
/// (legacy REFINERY_MGR / REFINERY_AC branches not ported). CREATED_BY / UPDATED_BY and the log USER_ID are the numeric NTPUSERS id
|
||||
/// (legacy session.userrecordid), the log USER_IP the caller's address. The Dinarak API is not called from here.
|
||||
/// </summary>
|
||||
public sealed class WalletsService(
|
||||
IWalletsRepository repository,
|
||||
IUnitOfWork unitOfWork,
|
||||
ICurrentUser user,
|
||||
IReportExcelService excel,
|
||||
IValidator<SaveWalletRequest> validator) : IWalletsService
|
||||
{
|
||||
private string Me => user.Id.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
|
||||
public Task<PagedResult<WalletRow>> SearchAsync(WalletsQuery query, PageRequest page, CancellationToken ct) =>
|
||||
repository.SearchAsync(query, page, ct);
|
||||
|
||||
public async Task<WalletDetail> GetAsync(long id, CancellationToken ct)
|
||||
{
|
||||
var w = await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery wallet", id);
|
||||
var active = string.Equals(w.StatusCode, WalletValues.Active, StringComparison.OrdinalIgnoreCase);
|
||||
var canActivate = false;
|
||||
if (!active)
|
||||
canActivate = (await ActiveIdsOfSameOwnerAsync(w.Tn, w.DriverNnpn, ct)).Count == 0;
|
||||
return new WalletDetail
|
||||
{
|
||||
Id = w.Id, Tn = w.Tn, CompanyCode = w.CompanyCode, Epayment = w.Epayment, OwnerNnpn = w.OwnerNnpn, WalletNumber = w.WalletNumber,
|
||||
OwnerName = w.OwnerName, HolderNnpn = w.HolderNnpn, HolderName = w.HolderName, OwnerNameEnglish = w.OwnerNameEnglish, DriverName = w.DriverName, DriverNnpn = w.DriverNnpn, Iban = w.Iban,
|
||||
BankAccount = w.BankAccount, BankName = w.BankName, BankBranch = w.BankBranch, CreationDate = w.CreationDate, CreatedBy = w.CreatedBy,
|
||||
UpdateDate = w.UpdateDate, UpdatedBy = w.UpdatedBy, StatusCode = w.StatusCode, PaymentMethod = w.PaymentMethod,
|
||||
CanUpdate = active, CanDeactivate = active, CanActivate = canActivate,
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<PagedResult<WalletLogRow>> GetLogAsync(long id, PageRequest page, CancellationToken ct)
|
||||
{
|
||||
_ = await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery wallet", id);
|
||||
return await repository.GetLogAsync(id, page, ct);
|
||||
}
|
||||
|
||||
private async Task<IReadOnlyList<long>> ActiveIdsOfSameOwnerAsync(long? tn, long? driverNnpn, CancellationToken ct) =>
|
||||
tn is not null ? await repository.GetActiveIdsByTruckAsync(tn.Value, ct)
|
||||
: driverNnpn is not null ? await repository.GetActiveIdsByDriverAsync(driverNnpn.Value, ct)
|
||||
: [];
|
||||
|
||||
/// <summary>refinery_walletfactory.cfc:100-117 / 188-203: a truck and a driver have one ACTIVE record each.</summary>
|
||||
private async Task EnsureNoOtherActiveAsync(WalletWrite w, long? exceptId, CancellationToken ct)
|
||||
{
|
||||
if (w.Tn is not null && (await repository.GetActiveIdsByTruckAsync(w.Tn.Value, ct)).Any(i => i != exceptId))
|
||||
throw new BusinessException(WalletsErrors.TruckHasActive, WalletsMessages.TruckHasActive);
|
||||
if (w.DriverNnpn is not null && (await repository.GetActiveIdsByDriverAsync(w.DriverNnpn.Value, ct)).Any(i => i != exceptId))
|
||||
throw new BusinessException(WalletsErrors.DriverHasActive, WalletsMessages.DriverHasActive);
|
||||
}
|
||||
|
||||
public async Task<WalletsResult> CreateAsync(SaveWalletRequest request, string? userIp, CancellationToken ct)
|
||||
{
|
||||
await validator.ValidateAndThrowAsync(request, ct);
|
||||
var record = WalletsRules.ToWrite(request);
|
||||
await EnsureNoOtherActiveAsync(record, null, ct);
|
||||
|
||||
var id = await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
var newId = await repository.InsertAsync(record, Me, token);
|
||||
await repository.InsertLogAsync(newId, WalletValues.LogCreate, Me, userIp, WalletsRules.EmptyJson, WalletsRules.CreateNewData(), token);
|
||||
return newId;
|
||||
}, ct);
|
||||
return new WalletsResult(WalletsMessages.Done, id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Legacy update keeps the history: the record is set INACTIVE and a new ACTIVE record with the new data is inserted (two log rows:
|
||||
/// CREATE on the new id, UPDATE with the changed columns on the old id). The payment method of a record cannot change (the select is disabled).
|
||||
/// </summary>
|
||||
public async Task<WalletsResult> UpdateAsync(long id, SaveWalletRequest request, string? userIp, CancellationToken ct)
|
||||
{
|
||||
var old = await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery wallet", id);
|
||||
if (!string.Equals(old.StatusCode, WalletValues.Active, StringComparison.OrdinalIgnoreCase))
|
||||
throw new BusinessException(WalletsErrors.StatusNotAllowed, WalletsMessages.StatusNotAllowed);
|
||||
request.PaymentMethod = WalletsRules.MethodOf(old);
|
||||
await validator.ValidateAndThrowAsync(request, ct);
|
||||
var record = WalletsRules.ToWrite(request);
|
||||
await EnsureNoOtherActiveAsync(record, id, ct);
|
||||
|
||||
var newId = await unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
await repository.SetStatusAsync(id, WalletValues.Inactive, Me, token);
|
||||
var created = await repository.InsertAsync(record, Me, token);
|
||||
await repository.InsertLogAsync(created, WalletValues.LogCreate, Me, userIp, WalletsRules.EmptyJson, WalletsRules.ReplacementNewData(record, Me), token);
|
||||
if (WalletsRules.Diff(old, record) is { } diff)
|
||||
await repository.InsertLogAsync(id, WalletValues.LogUpdate, Me, userIp, diff.OldData, diff.NewData, token);
|
||||
return created;
|
||||
}, ct);
|
||||
return new WalletsResult(WalletsMessages.Done, newId);
|
||||
}
|
||||
|
||||
public async Task<WalletsResult> ActivateAsync(long id, string? userIp, CancellationToken ct)
|
||||
{
|
||||
var w = await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery wallet", id);
|
||||
// STATUS_ACTION_MATRIX: CHSTAT only INACTIVE -> ACTIVE
|
||||
if (!string.Equals(w.StatusCode, WalletValues.Inactive, StringComparison.OrdinalIgnoreCase))
|
||||
throw new BusinessException(WalletsErrors.StatusNotAllowed, WalletsMessages.StatusNotAllowed);
|
||||
// refinery_walletfactory.cfc:296-306: no other ACTIVE record for the same truck (or driver when there is no truck)
|
||||
if ((await ActiveIdsOfSameOwnerAsync(w.Tn, w.DriverNnpn, ct)).Count > 0)
|
||||
throw w.Tn is not null
|
||||
? new BusinessException(WalletsErrors.TruckHasActive, WalletsMessages.TruckHasActive)
|
||||
: new BusinessException(WalletsErrors.DriverHasActive, WalletsMessages.DriverHasActive);
|
||||
await ChangeStatusAsync(id, WalletValues.Inactive, WalletValues.Active, WalletValues.LogActivate, userIp, ct);
|
||||
return new WalletsResult(WalletsMessages.Done, id);
|
||||
}
|
||||
|
||||
public async Task<WalletsResult> DeactivateAsync(long id, string? userIp, CancellationToken ct)
|
||||
{
|
||||
var w = await repository.GetAsync(id, ct) ?? throw new NotFoundException("Refinery wallet", id);
|
||||
// STATUS_ACTION_MATRIX: DEACTIVATE only from ACTIVE
|
||||
if (!string.Equals(w.StatusCode, WalletValues.Active, StringComparison.OrdinalIgnoreCase))
|
||||
throw new BusinessException(WalletsErrors.StatusNotAllowed, WalletsMessages.StatusNotAllowed);
|
||||
await ChangeStatusAsync(id, WalletValues.Active, WalletValues.Inactive, WalletValues.LogDeactivate, userIp, ct);
|
||||
return new WalletsResult(WalletsMessages.Done, id);
|
||||
}
|
||||
|
||||
private Task ChangeStatusAsync(long id, string from, string to, string method, string? userIp, CancellationToken ct) =>
|
||||
unitOfWork.ExecuteInTransactionAsync(async token =>
|
||||
{
|
||||
await repository.SetStatusAsync(id, to, Me, token);
|
||||
var (o, n) = WalletsRules.StatusChange(from, to);
|
||||
await repository.InsertLogAsync(id, method, Me, userIp, o, n, token);
|
||||
return true;
|
||||
}, ct);
|
||||
|
||||
public async Task<ExportFile> ExportAsync(WalletsQuery query, CancellationToken ct)
|
||||
{
|
||||
var rows = new List<WalletRow>();
|
||||
for (var p = 1; rows.Count < 20000; p++)
|
||||
{
|
||||
var r = await repository.SearchAsync(query, new PageRequest(p, PageRequest.MaxPageSize), ct);
|
||||
rows.AddRange(r.Items);
|
||||
if (r.Items.Count == 0 || rows.Count >= r.TotalCount) break;
|
||||
}
|
||||
// legacy report columns: counter, TN, payment method, owner national no., owner name, wallet no., IBAN, bank account, bank name, status
|
||||
var cols = new List<ReportColumn>
|
||||
{
|
||||
new("counter", "متسلسل", "#"), new("tn", "رقم الشاحنة", "Truck"), new("paymentMethod", "طريقة الدفع", "Payment method"),
|
||||
new("ownerNnpn", "الرقم الوطني للمالك", "Owner national no."), new("ownerName", "اسم المالك", "Owner name"),
|
||||
new("walletNumber", "رقم المحفظة", "Wallet number"), new("iban", "IBAN", "IBAN"), new("bankAccount", "رقم الحساب", "Bank account"),
|
||||
new("bankName", "اسم البنك", "Bank name"), new("status", "الحالة", "Status"),
|
||||
};
|
||||
var n = 0;
|
||||
var data = rows.Select(r => (IReadOnlyDictionary<string, object?>)new Dictionary<string, object?>
|
||||
{
|
||||
["counter"] = ++n, ["tn"] = r.Tn, ["paymentMethod"] = KindCaption(r.PaymentMethod), ["ownerNnpn"] = r.HolderNnpn,
|
||||
["ownerName"] = r.HolderName, ["walletNumber"] = r.WalletNumber, ["iban"] = r.Iban, ["bankAccount"] = r.BankAccount,
|
||||
["bankName"] = r.BankName, ["status"] = WalletsRules.StatusCaption(r.StatusCode ?? string.Empty),
|
||||
}).ToList();
|
||||
var table = new ReportTable { Key = "REFINERY_WALLET", TitleAr = "شاشة طرق الدفع", TitleEn = "Payment methods", Columns = cols, Rows = data };
|
||||
return new ExportFile(excel.Build(table, user.UserId, DateTime.Now, true),
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "REFINERY_WALLET.xlsx");
|
||||
}
|
||||
|
||||
/// <summary>Captions REFINERY_WALLET.BANK / EWALLET / DRAIVER_WALLET.</summary>
|
||||
public static string KindCaption(string? kind) => kind switch
|
||||
{
|
||||
WalletValues.KindBank => "حوالة بنكية",
|
||||
WalletValues.KindEWallet => "محفظة الالكترونية",
|
||||
WalletValues.KindDriverWallet => "محفظة سائق",
|
||||
_ => kind ?? string.Empty,
|
||||
};
|
||||
}
|
||||
|
|
@ -52,7 +52,7 @@ public static class GrainsOrderConstants
|
|||
|
||||
/// <summary>New GRAINSTENDERORDER row.</summary>
|
||||
public sealed record NewTenderOrder(
|
||||
long CargoType, long Location, long Destination, DateTime OrderDate, int? MobileShift,
|
||||
long CargoType, long Location, long Destination, DateTime OrderDate, int MobileShift,
|
||||
int Quantity, string? Type, string Ct, string CreatedBy);
|
||||
|
||||
/// <summary>New GRAINS_BILLING row (columns exactly as written by legacy addBillingInfo).</summary>
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ public sealed record DistributionCategory(string Request, string DistributionCod
|
|||
public bool IsGallabCompany => Request == "BULK_GALLAB_COMP";
|
||||
|
||||
public static readonly string[] Allowed =
|
||||
["PCKD", "BULK_AHALE", "BULK_COMP", "BULK_GALLAB_COMP", "BULK_GALLAB_AHALE", "RED_SEA"];
|
||||
["PCKD", "BULK_AHALE", "BULK_COMP", "BULK_GALLAB_COMP", "BULK_GALLAB_AHALE"];
|
||||
|
||||
public static DistributionCategory? Parse(string? request)
|
||||
{
|
||||
|
|
@ -156,8 +156,6 @@ public sealed record DistributionCategory(string Request, string DistributionCod
|
|||
"BULK_AHALE" => new(r, "BULK", "AHALE", "BULK"),
|
||||
"BULK_COMP" => new(r, "BULK", "COMP", "BULK"),
|
||||
"PCKD" => new(r, "PCKD", "", "PCKD"),
|
||||
// البحر الأحمر: its own cargo class / queue code RED_SEA, not split into individuals and companies (new, no legacy counterpart)
|
||||
"RED_SEA" => new(r, "RED_SEA", "", "RED_SEA"),
|
||||
"BULK_GALLAB_COMP" => new(r, "BULK_GALLAB", "COMP", "BULK"),
|
||||
"BULK_GALLAB_AHALE" => new(r, "BULK_GALLAB", "AHALE", "BULK"),
|
||||
_ => null
|
||||
|
|
@ -182,7 +180,6 @@ public sealed record DistributionCategory(string Request, string DistributionCod
|
|||
"BULK_COMP" => "لا توجد طلبات سائب شركات مسجلة على النظام ، او قد تم توزيع كامل الطلبية",
|
||||
"BULK_GALLAB_COMP" => "لا توجد طلبات قلاب شركات مسجلة على النظام ، او قد تم توزيع كامل الطلبية",
|
||||
"BULK_GALLAB_AHALE" => "لا توجد طلبات قلاب أفراد مسجلة على النظام ، او قد تم توزيع كامل الطلبية",
|
||||
"RED_SEA" => "لا توجد طلبات البحر الأحمر مسجلة على النظام ، او قد تم توزيع كامل الطلبية",
|
||||
_ => string.Empty
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,25 +59,10 @@ public static class DependencyInjection
|
|||
// mobile notifications run in the background in their own scope (see MobileNotificationGatewayService)
|
||||
services.AddScoped<NTP.Infrastructure.Grains.NotificationDispatcher>();
|
||||
|
||||
// Refinery: Jopetrol claim web service (OFF unless Refinery:Jopetrol:Enabled; credentials only from env / .env)
|
||||
services.AddOptions<NTP.Infrastructure.Integrations.JopetrolOptions>()
|
||||
.Bind(configuration.GetSection(NTP.Infrastructure.Integrations.JopetrolOptions.SectionName));
|
||||
services.AddHttpClient(NTP.Infrastructure.Integrations.JopetrolOptions.HttpClientName);
|
||||
services.AddScoped<NTP.Application.Refinery.Integrations.IJopetrolGateway, NTP.Infrastructure.Integrations.JopetrolGateway>();
|
||||
|
||||
// Convention: every concrete *Repository / *Service in this assembly is registered against I{Name} (scoped).
|
||||
// Do NOT add per-table lines here.
|
||||
services.AddConventionalServices(typeof(DependencyInjection).Assembly);
|
||||
|
||||
// Refinery: Dinarak payment API (no "Service" suffix, so not convention registered). Off unless Refinery:Dinarak:Enabled.
|
||||
services.AddOptions<NTP.Infrastructure.Integrations.DinarakOptions>()
|
||||
.Bind(configuration.GetSection(NTP.Infrastructure.Integrations.DinarakOptions.SectionName));
|
||||
services.AddHttpClient(NTP.Infrastructure.Integrations.DinarakOptions.HttpClientName, (sp, client) =>
|
||||
client.Timeout = TimeSpan.FromSeconds(Math.Max(5, sp.GetRequiredService<Microsoft.Extensions.Options.IOptions<NTP.Infrastructure.Integrations.DinarakOptions>>().Value.TimeoutSeconds)));
|
||||
services.AddScoped<NTP.Infrastructure.Integrations.DinarakGateway>();
|
||||
services.AddScoped<NTP.Application.Refinery.Integrations.IDinarakGateway>(sp => sp.GetRequiredService<NTP.Infrastructure.Integrations.DinarakGateway>());
|
||||
services.AddScoped<NTP.Application.Refinery.Integrations.IDinarakReferenceGateway>(sp => sp.GetRequiredService<NTP.Infrastructure.Integrations.DinarakGateway>());
|
||||
|
||||
services.AddHealthChecks()
|
||||
.AddCheck<OracleHealthCheck>("oracle", tags: ["ready"])
|
||||
.AddCheck<NtpSchemaHealthCheck>("oracle-ntp", tags: ["ready"]);
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
using System.Net.Http.Headers;
|
||||
using System.Text;
|
||||
|
||||
namespace NTP.Infrastructure.Integrations;
|
||||
|
||||
/// <summary>HTTP status and body of one Dinarak call.</summary>
|
||||
public sealed record DinarakHttpResult(int Status, string Body);
|
||||
|
||||
/// <summary>
|
||||
/// The four HTTP calls of legacy RefinaryDinarakApi.cfc, no database, no business rules (those are in <see cref="DinarakGateway"/>).
|
||||
/// Headers as legacy: JSON content, Accept-Language "ar" for /token and "en" for the others, Authorization "bearer {token}".
|
||||
/// </summary>
|
||||
public sealed class DinarakClient(HttpClient http, DinarakOptions options)
|
||||
{
|
||||
private string Url(string path) => (options.BaseUrl ?? string.Empty).TrimEnd('/') + path;
|
||||
|
||||
private async Task<DinarakHttpResult> SendAsync(HttpMethod method, string url, string? json, string? bearer, string language, CancellationToken ct)
|
||||
{
|
||||
using var request = new HttpRequestMessage(method, url);
|
||||
request.Headers.TryAddWithoutValidation("Accept-Language", language);
|
||||
if (bearer is not null) request.Headers.TryAddWithoutValidation("Authorization", bearer);
|
||||
if (json is not null) request.Content = new StringContent(json, Encoding.UTF8, new MediaTypeHeaderValue("application/json") { CharSet = "utf-8" });
|
||||
using var response = await http.SendAsync(request, ct);
|
||||
return new DinarakHttpResult((int)response.StatusCode, await response.Content.ReadAsStringAsync(ct));
|
||||
}
|
||||
|
||||
/// <summary>POST /token with the configured user and password.</summary>
|
||||
public Task<DinarakHttpResult> GetTokenAsync(CancellationToken ct = default) =>
|
||||
SendAsync(HttpMethod.Post, Url("/token"), DinarakProtocol.BuildTokenRequest(options.UserName ?? string.Empty, options.Password ?? string.Empty), null, "ar", ct);
|
||||
|
||||
/// <summary>GET /Transfer/AliasResolve?aliastype=MOBL&value={wallet}.</summary>
|
||||
public Task<DinarakHttpResult> AliasResolveAsync(string bearer, string walletNumber, CancellationToken ct = default) =>
|
||||
SendAsync(HttpMethod.Get, Url("/Transfer/AliasResolve?aliastype=MOBL&value=" + Uri.EscapeDataString(walletNumber)), null, bearer, "en", ct);
|
||||
|
||||
/// <summary>POST /transfer/transfer.</summary>
|
||||
public Task<DinarakHttpResult> TransferAsync(string bearer, string requestJson, CancellationToken ct = default) =>
|
||||
SendAsync(HttpMethod.Post, Url("/transfer/transfer"), requestJson, bearer, "en", ct);
|
||||
|
||||
/// <summary>GET /transfer/transferByMessageID?MessageID={id}.</summary>
|
||||
public Task<DinarakHttpResult> GetByMessageIdAsync(string bearer, string messageId, CancellationToken ct = default) =>
|
||||
SendAsync(HttpMethod.Get, Url("/transfer/transferByMessageID?MessageID=" + Uri.EscapeDataString(messageId)), null, bearer, "en", ct);
|
||||
}
|
||||
|
|
@ -1,162 +0,0 @@
|
|||
using System.Text.Json;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
using NTP.Infrastructure.Persistence;
|
||||
using Oracle.ManagedDataAccess.Client;
|
||||
|
||||
namespace NTP.Infrastructure.Integrations;
|
||||
|
||||
/// <summary>
|
||||
/// Port of RefinaryDinarakApi.cfc: ProcessTransfer (duplicate check, amount check against CalculateRefinaryAmount, token, AliasResolve,
|
||||
/// transfer) and getTransferByMessageID, with the REFINERY_DINARAK_API_LOG rows of the legacy code. Switched off unless
|
||||
/// Refinery:Dinarak:Enabled is true (answers code 106 and calls nothing). Not registered by convention (no "Service" suffix): see DependencyInjection.
|
||||
/// </summary>
|
||||
public sealed class DinarakGateway(
|
||||
IDbSession session,
|
||||
IHttpClientFactory httpFactory,
|
||||
IOptions<DinarakOptions> options,
|
||||
ILogger<DinarakGateway> logger)
|
||||
: OracleRepositoryBase(session, logger), IDinarakGateway, IDinarakReferenceGateway
|
||||
{
|
||||
// legacy <cflock timeout="10">: one transfer at a time, so two clicks cannot both pass the duplicate check
|
||||
private static readonly SemaphoreSlim TransferLock = new(1, 1);
|
||||
private const int Limit = 3000; // keeps the CLOB binds small
|
||||
|
||||
private sealed class TripRef { public decimal? ReferenceId { get; set; } public string? LoadingNo { get; set; } }
|
||||
|
||||
private DinarakOptions Options => options.Value;
|
||||
|
||||
private DinarakClient Client() => new(httpFactory.CreateClient(DinarakOptions.HttpClientName), Options);
|
||||
|
||||
private static string Cut(string? s) => s is null ? string.Empty : s.Length <= Limit ? s : s[..Limit];
|
||||
|
||||
private static string Packed(int status, string body) =>
|
||||
JsonSerializer.Serialize(new { statusCode = status, body = Cut(body) }, new JsonSerializerOptions { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
|
||||
|
||||
private Task LogCallAsync(long logId, string status, string service, string wallet, decimal amount, string nnpn, string request, string response, long tripId, CancellationToken ct) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_DINARAK_API_LOG (ID, CREATION_DATE, STATUS_CODE, SERVICE_NAME, EWALLET_NUMBER, AMOUNT, NNPN, REQUEST_DATA, RESPONSE_DATA, REFINERY_TRIP_ID)
|
||||
VALUES (:Id, SYSDATE, :Status, :Service, :Wallet, :Amount, :Nnpn, :Request, :Response, :TripId)
|
||||
""", new { Id = logId, Status = status, Service = service, Wallet = wallet, Amount = amount, Nnpn = nnpn, Request = Cut(request), Response = Cut(response), TripId = tripId }, ct);
|
||||
|
||||
private Task<long> NextLogIdAsync(CancellationToken ct) =>
|
||||
ExecuteScalarAsync<long>("SELECT SEQ_REFINARY_DINARK_API_LOG_ID.NEXTVAL FROM DUAL", null, ct);
|
||||
|
||||
/// <summary>GetAPIToken: also writes the TOKEN log row (without the password, and without the token of the answer).</summary>
|
||||
private async Task<string?> TokenAsync(DinarakClient client, long tripId, string wallet, string nnpn, decimal amount, CancellationToken ct)
|
||||
{
|
||||
string? bearer = null;
|
||||
var status = "FAILED";
|
||||
var responseLog = string.Empty;
|
||||
try
|
||||
{
|
||||
var r = await client.GetTokenAsync(ct);
|
||||
responseLog = Packed(r.Status, "[token answer not stored]");
|
||||
if (r.Status == 200)
|
||||
{
|
||||
bearer = DinarakProtocol.ParseBearer(r.Body);
|
||||
if (bearer is not null) status = "PROCESSED";
|
||||
}
|
||||
}
|
||||
catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException or JsonException)
|
||||
{
|
||||
responseLog = Packed(0, ex.GetType().Name);
|
||||
}
|
||||
finally
|
||||
{
|
||||
await LogCallAsync(await NextLogIdAsync(ct), status, "TOKEN", wallet, amount, nnpn,
|
||||
DinarakProtocol.BuildTokenRequestForLog(Options.UserName ?? string.Empty), responseLog, tripId, ct);
|
||||
}
|
||||
return bearer;
|
||||
}
|
||||
|
||||
private async Task<string?> TokenWithoutLogAsync(DinarakClient client, CancellationToken ct)
|
||||
{
|
||||
try
|
||||
{
|
||||
var r = await client.GetTokenAsync(ct);
|
||||
return r.Status == 200 ? DinarakProtocol.ParseBearer(r.Body) : null;
|
||||
}
|
||||
catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException or JsonException)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<DinarakTransferResult> TransferAsync(long tripId, string walletNumber, string nnpn, decimal amount, string receiverName, CancellationToken ct = default)
|
||||
{
|
||||
if (!Options.Enabled) return new("106", "DINARAK_DISABLED");
|
||||
if (!await TransferLock.WaitAsync(TimeSpan.FromSeconds(10), ct)) return new("104", "SYSTEM_ERROR_BUSY");
|
||||
try
|
||||
{
|
||||
// already paid?
|
||||
var paid = await ExecuteScalarAsync<long>(
|
||||
"SELECT COUNT(*) FROM REFINERY_DINARAK_API_LOG WHERE SERVICE_NAME = 'TRANSFER' AND STATUS_CODE = 'PROCESSED' AND REFINERY_TRIP_ID = :Id", new { Id = tripId }, ct);
|
||||
if (paid > 0) return new("105", "The transaction has already been paid!");
|
||||
|
||||
// the amount the screen sends must be the amount the database calculates
|
||||
var calculated = await QueryFirstAsync<decimal?>("SELECT ROUND(CalculateRefinaryAmount(:Id), 3) FROM DUAL", new { Id = tripId }, ct);
|
||||
if (calculated is null || !DinarakProtocol.AmountMatches(calculated.Value, amount)) return new("101", "Amount_Not_Match");
|
||||
|
||||
var trip = await QueryFirstAsync<TripRef>(
|
||||
"SELECT DINARAK_REFERENCE_ID AS ReferenceId, NVL(DISCHARGE_AUTHORIZTION_NO, '0') AS LoadingNo FROM REFINERY_TRIPS WHERE ID = :Id", new { Id = tripId }, ct);
|
||||
var reference = trip?.ReferenceId ?? tripId;
|
||||
var loadingNo = trip?.LoadingNo ?? "0";
|
||||
|
||||
var client = Client();
|
||||
// the legacy code went on with an empty token (and answered "Invalid Wallet"); here a missing token is reported as such
|
||||
var bearer = await TokenAsync(client, tripId, walletNumber, nnpn, amount, ct);
|
||||
if (bearer is null) return new("103", "TOKEN_ERROR");
|
||||
|
||||
string operation;
|
||||
if (Options.InternalSalaryWallets.Contains(walletNumber, StringComparer.Ordinal)) operation = DinarakProtocol.SalaryOperation;
|
||||
else
|
||||
{
|
||||
var alias = await client.AliasResolveAsync(bearer, walletNumber, ct);
|
||||
var pic = alias.Status == 200 ? DinarakProtocol.ParsePicCode(alias.Body) : null;
|
||||
if (pic is null) return new("104", "Invalid Wallet");
|
||||
operation = DinarakProtocol.OperationFor(pic);
|
||||
}
|
||||
|
||||
var logId = await NextLogIdAsync(ct);
|
||||
var requestJson = DinarakProtocol.BuildTransferRequest(receiverName, amount, loadingNo, reference, walletNumber, operation);
|
||||
var http = await client.TransferAsync(bearer, requestJson, ct);
|
||||
var result = DinarakProtocol.MapTransferResponse(http.Status, http.Body);
|
||||
|
||||
await LogCallAsync(logId, result.Success ? "PROCESSED" : "FAILED", "TRANSFER", walletNumber, amount, nnpn, requestJson, Packed(http.Status, http.Body), tripId, ct);
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex) when (ex is not OperationCanceledException || !ct.IsCancellationRequested)
|
||||
{
|
||||
logger.LogError(ex, "Dinarak transfer of trip {TripId} failed", tripId);
|
||||
return new("104", "SYSTEM_ERROR_" + ex.Message);
|
||||
}
|
||||
finally
|
||||
{
|
||||
TransferLock.Release();
|
||||
}
|
||||
}
|
||||
|
||||
public Task<DinarakTransferStatus> GetTransferByMessageIdAsync(long messageId, CancellationToken ct = default) =>
|
||||
GetTransferByReferenceAsync(messageId, ct);
|
||||
|
||||
public async Task<DinarakTransferStatus> GetTransferByReferenceAsync(decimal reference, CancellationToken ct = default)
|
||||
{
|
||||
if (!Options.Enabled) return new(false, "DISABLED", null);
|
||||
try
|
||||
{
|
||||
var client = Client();
|
||||
var bearer = await TokenWithoutLogAsync(client, ct);
|
||||
if (bearer is null) return new(false, "ERROR", null);
|
||||
var r = await client.GetByMessageIdAsync(bearer, DinarakProtocol.FormatMessageId(reference), ct);
|
||||
return DinarakProtocol.MapStatusResponse(r.Status, r.Body);
|
||||
}
|
||||
catch (Exception ex) when (ex is HttpRequestException or TaskCanceledException)
|
||||
{
|
||||
logger.LogWarning(ex, "Dinarak status lookup failed");
|
||||
return new(false, "ERROR", null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
namespace NTP.Infrastructure.Integrations;
|
||||
|
||||
/// <summary>
|
||||
/// Dinarak payment API (config section "Refinery:Dinarak"; legacy application.DINARAK_API {url, username, password}).
|
||||
/// The user name and password are SECRETS: set them through the environment (Refinery__Dinarak__UserName, Refinery__Dinarak__Password),
|
||||
/// never in a file of the repository. Off by default: nothing is called while <see cref="Enabled"/> is false.
|
||||
/// </summary>
|
||||
public sealed class DinarakOptions
|
||||
{
|
||||
public const string SectionName = "Refinery:Dinarak";
|
||||
public const string HttpClientName = "Dinarak";
|
||||
|
||||
public bool Enabled { get; set; }
|
||||
/// <summary>Base address of the API, without a trailing slash (the legacy "url"; /token, /Transfer/AliasResolve, /transfer/transfer are appended).</summary>
|
||||
public string? BaseUrl { get; set; }
|
||||
public string? UserName { get; set; }
|
||||
public string? Password { get; set; }
|
||||
public int TimeoutSeconds { get; set; } = 30;
|
||||
|
||||
/// <summary>
|
||||
/// Wallet numbers that skip the AliasResolve call and always use the operation "bank salary internal" (the legacy code hard-coded one
|
||||
/// such number). Empty by default; fill it in the environment if that wallet is still used (Refinery__Dinarak__InternalSalaryWallets__0).
|
||||
/// </summary>
|
||||
public string[] InternalSalaryWallets { get; set; } = [];
|
||||
}
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Text.Encodings.Web;
|
||||
using System.Text.Json;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
|
||||
namespace NTP.Infrastructure.Integrations;
|
||||
|
||||
/// <summary>
|
||||
/// The pure parts of legacy backend/common/RefinaryDinarakApi.cfc: request bodies, wallet type to operation mapping, response mapping and
|
||||
/// the amount comparison. No I/O, so they are unit tested without a server.
|
||||
/// </summary>
|
||||
public static class DinarakProtocol
|
||||
{
|
||||
/// <summary>picCode values of the Jordanian wallet providers that are paid with the operation "Transfer" (RefinaryDinarakApi.cfc:132).</summary>
|
||||
public static readonly string[] TransferWalletTypes =
|
||||
["ZAINJOPX", "ORNGJOPX", "DNRKJOPX", "GDHAJOPX", "MEPSJOPX", "ALWPJOPX", "UWLTJOPX", "MDFTJOPX"];
|
||||
|
||||
public const string TransferOperation = "Transfer";
|
||||
public const string SalaryOperation = "bank salary internal";
|
||||
|
||||
/// <summary>Statuses of getTransferByMessageID that count as "already sent" (RefinaryDinarakApi.cfc:233).</summary>
|
||||
public static readonly string[] AcceptedStatuses = ["Success", "Processing", "New"];
|
||||
|
||||
private static readonly JsonWriterOptions Raw = new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
|
||||
|
||||
private static string Write(Action<Utf8JsonWriter> body)
|
||||
{
|
||||
using var ms = new MemoryStream();
|
||||
using (var w = new Utf8JsonWriter(ms, Raw)) body(w);
|
||||
return System.Text.Encoding.UTF8.GetString(ms.ToArray());
|
||||
}
|
||||
|
||||
/// <summary>Body of POST /token.</summary>
|
||||
public static string BuildTokenRequest(string userName, string password) => Write(w =>
|
||||
{
|
||||
w.WriteStartObject();
|
||||
w.WriteString("username", userName);
|
||||
w.WriteString("password", password);
|
||||
w.WriteString("grant_type", "password");
|
||||
w.WriteEndObject();
|
||||
});
|
||||
|
||||
/// <summary>Token request as it is kept in REFINERY_DINARAK_API_LOG: the legacy code stored the password there, this one does not.</summary>
|
||||
public static string BuildTokenRequestForLog(string userName) => BuildTokenRequest(userName, "***");
|
||||
|
||||
/// <summary>"Transfer" for a known wallet provider, otherwise "bank salary internal" (picCode of AliasResolve, case-insensitive).</summary>
|
||||
public static string OperationFor(string? picCode) =>
|
||||
picCode is not null && TransferWalletTypes.Contains(picCode.Trim(), StringComparer.OrdinalIgnoreCase) ? TransferOperation : SalaryOperation;
|
||||
|
||||
/// <summary>picCode of the AliasResolve answer, or null when the body is not the expected JSON (legacy: "Invalid Wallet").</summary>
|
||||
public static string? ParsePicCode(string body)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
return doc.RootElement.TryGetProperty("picCode", out var p) && p.ValueKind == JsonValueKind.String ? p.GetString() : null;
|
||||
}
|
||||
catch (JsonException) { return null; }
|
||||
}
|
||||
|
||||
/// <summary>"352.1": the message id / reference of a trip (a decimal because ACTIVATE_WALLET_EXCHANGE adds 0.01).</summary>
|
||||
public static string FormatMessageId(decimal id) => id.ToString("0.##########", CultureInfo.InvariantCulture);
|
||||
|
||||
/// <summary>
|
||||
/// Body of POST /transfer/transfer, same property order as the legacy struct. Description is " {loadingNumber}" (leading space as in
|
||||
/// the legacy code); MessageId and Reference both carry the trip's Dinarak reference id.
|
||||
/// </summary>
|
||||
public static string BuildTransferRequest(string receiverName, decimal amount, string loadingNumber, decimal reference, string walletNumber, string operationName) =>
|
||||
Write(w =>
|
||||
{
|
||||
var id = FormatMessageId(reference);
|
||||
w.WriteStartObject();
|
||||
w.WriteString("Name", receiverName);
|
||||
w.WriteNumber("Amount", amount);
|
||||
w.WriteString("Description", " " + loadingNumber);
|
||||
w.WriteString("MessageId", id);
|
||||
w.WriteString("Reference", id);
|
||||
w.WriteString("ReceiverID", walletNumber);
|
||||
w.WriteString("OperationName", operationName);
|
||||
w.WriteStartArray("Conditions");
|
||||
w.WriteStartObject();
|
||||
w.WriteString("NationalId", string.Empty);
|
||||
w.WriteEndObject();
|
||||
w.WriteEndArray();
|
||||
w.WriteEndObject();
|
||||
});
|
||||
|
||||
/// <summary>Same value check as legacy: |calculated - requested| rounded to 3 decimals must not exceed 0.001.</summary>
|
||||
public static bool AmountMatches(decimal calculated, decimal requested) =>
|
||||
Math.Round(Math.Abs(calculated - requested), 3, MidpointRounding.AwayFromZero) <= 0.001m;
|
||||
|
||||
private static string Underscored(string? text) => (text ?? string.Empty).Replace(' ', '_');
|
||||
|
||||
/// <summary>Answer of POST /transfer/transfer: 200 + status.name Success = 000; other status = 102 (error text with underscores); HTTP error = 103.</summary>
|
||||
public static DinarakTransferResult MapTransferResponse(int httpStatus, string body)
|
||||
{
|
||||
if (httpStatus != 200) return new("103", Underscored(body));
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var status = doc.RootElement.GetProperty("status");
|
||||
var name = status.GetProperty("name").GetString();
|
||||
if (string.Equals(name, "Success", StringComparison.Ordinal)) return new("000", "SUCCESS");
|
||||
var error = status.TryGetProperty("errorMessage", out var e) && e.ValueKind == JsonValueKind.String ? e.GetString() : name;
|
||||
return new("102", Underscored(error));
|
||||
}
|
||||
catch (Exception ex) when (ex is JsonException or KeyNotFoundException or InvalidOperationException)
|
||||
{
|
||||
return new("104", "SYSTEM_ERROR_INVALID_RESPONSE");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Answer of GET /transfer/transferByMessageID. A non-200 answer means "nothing found" (legacy: not accepted); StatusName "HTTP_{code}".</summary>
|
||||
public static DinarakTransferStatus MapStatusResponse(int httpStatus, string body)
|
||||
{
|
||||
if (httpStatus != 200) return new(false, $"HTTP_{httpStatus}", body);
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
var name = doc.RootElement.GetProperty("status").GetProperty("name").GetString();
|
||||
return new(name is not null && AcceptedStatuses.Contains(name, StringComparer.Ordinal), name, body);
|
||||
}
|
||||
catch (Exception ex) when (ex is JsonException or KeyNotFoundException or InvalidOperationException)
|
||||
{
|
||||
return new(false, "ERROR", body);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>The access token of the POST /token answer, as the Authorization header value the legacy code built ("bearer {token}"), or null.</summary>
|
||||
public static string? ParseBearer(string body)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
return doc.RootElement.TryGetProperty("access_token", out var t) && t.ValueKind == JsonValueKind.String && !string.IsNullOrEmpty(t.GetString())
|
||||
? "bearer " + t.GetString()
|
||||
: null;
|
||||
}
|
||||
catch (JsonException) { return null; }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
using System.Security;
|
||||
using System.Text;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
|
||||
namespace NTP.Infrastructure.Integrations;
|
||||
|
||||
/// <summary>
|
||||
/// Section <c>Refinery:Jopetrol</c>. OFF by default. <see cref="UserName"/> and <see cref="Password"/> are secrets: they come only from the
|
||||
/// environment / server .env (<c>Refinery__Jopetrol__UserName</c>, <c>Refinery__Jopetrol__Password</c>), never from a file in the repository.
|
||||
/// </summary>
|
||||
public sealed class JopetrolOptions
|
||||
{
|
||||
public const string SectionName = "Refinery:Jopetrol";
|
||||
public const string HttpClientName = "Jopetrol";
|
||||
|
||||
public bool Enabled { get; set; }
|
||||
/// <summary>The ASMX endpoint of the Jopetrol TransportPaymentWS service.</summary>
|
||||
public string Url { get; set; } = "";
|
||||
public string UserName { get; set; } = "";
|
||||
public string Password { get; set; } = "";
|
||||
public int TimeoutSeconds { get; set; } = 30;
|
||||
}
|
||||
|
||||
/// <summary>Request building and answer parsing of the Jopetrol SOAP call (kept apart from the HTTP code so it can be tested).</summary>
|
||||
public static class JopetrolSoap
|
||||
{
|
||||
public const string SoapNamespace = "http://www.w3.org/2003/05/soap-envelope";
|
||||
public const string ServiceNamespace = "http://jopetrol.com.jo/TransportPaymentWS";
|
||||
|
||||
/// <summary>The envelope of legacy callRefinaryUpdateStatusTo7 (SOAP 1.2, AuthHeader + sendClaimandUpdateStatusTo7 with TransNumber and claimNo).</summary>
|
||||
public static string BuildEnvelope(string userName, string password, string pn, string claimNo)
|
||||
{
|
||||
static string E(string s) => SecurityElement.Escape(s) ?? "";
|
||||
return $"""
|
||||
<soap:Envelope xmlns:soap="{SoapNamespace}" xmlns:tran="{ServiceNamespace}">
|
||||
<soap:Header><tran:AuthHeader><tran:UserName>{E(userName)}</tran:UserName><tran:Password>{E(password)}</tran:Password></tran:AuthHeader></soap:Header>
|
||||
<soap:Body><tran:sendClaimandUpdateStatusTo7><tran:TransNumber>{E(pn)}</tran:TransNumber><tran:claimNo>{E(claimNo)}</tran:claimNo></tran:sendClaimandUpdateStatusTo7></soap:Body>
|
||||
</soap:Envelope>
|
||||
""";
|
||||
}
|
||||
|
||||
/// <summary>Text of <c>sendClaimandUpdateStatusTo7Result</c> (legacy xmlSearch "//*[local-name()=...]"); null when the answer does not contain it.</summary>
|
||||
public static string? ParseResult(string xml)
|
||||
{
|
||||
var doc = XDocument.Parse(xml);
|
||||
return doc.Descendants().FirstOrDefault(e => e.Name.LocalName == "sendClaimandUpdateStatusTo7Result")?.Value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Jopetrol claim web service (legacy refinery_wage_claimfactory.callRefinaryUpdateStatusTo7). Returns null WITHOUT any call when
|
||||
/// <c>Refinery:Jopetrol:Enabled</c> is false. HTTP errors, time-outs and unreadable answers are thrown (the caller decides what to tell the user).
|
||||
/// </summary>
|
||||
public sealed class JopetrolGateway(IHttpClientFactory httpClients, IOptions<JopetrolOptions> options, ILogger<JopetrolGateway> logger) : IJopetrolGateway
|
||||
{
|
||||
public async Task<string?> SendClaimAndUpdateStatusTo7Async(string pn, string claimNo, CancellationToken ct = default)
|
||||
{
|
||||
var o = options.Value;
|
||||
if (!o.Enabled) return null;
|
||||
if (string.IsNullOrWhiteSpace(o.Url) || string.IsNullOrWhiteSpace(o.UserName) || string.IsNullOrWhiteSpace(o.Password))
|
||||
throw new InvalidOperationException("Refinery:Jopetrol is enabled but Url / UserName / Password are not configured.");
|
||||
|
||||
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
|
||||
cts.CancelAfter(TimeSpan.FromSeconds(o.TimeoutSeconds is > 0 and <= 300 ? o.TimeoutSeconds : 30));
|
||||
|
||||
using var request = new HttpRequestMessage(HttpMethod.Post, o.Url)
|
||||
{
|
||||
Content = new StringContent(JopetrolSoap.BuildEnvelope(o.UserName, o.Password, pn, claimNo), Encoding.UTF8, "text/xml"),
|
||||
};
|
||||
using var response = await httpClients.CreateClient(JopetrolOptions.HttpClientName).SendAsync(request, cts.Token);
|
||||
var body = await response.Content.ReadAsStringAsync(cts.Token);
|
||||
logger.LogInformation("Jopetrol sendClaimandUpdateStatusTo7 for permit {Pn}: HTTP {Status}", pn, (int)response.StatusCode);
|
||||
|
||||
// legacy parsed whatever came back; a SOAP fault or an HTML error page has no result element
|
||||
try { return JopetrolSoap.ParseResult(body) ?? ""; }
|
||||
catch (XmlException) { throw new InvalidOperationException($"Jopetrol answered HTTP {(int)response.StatusCode} with an unreadable body."); }
|
||||
}
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ internal sealed class DistributionRepository(IDbSession session, ILogger<Distrib
|
|||
{
|
||||
var sql = packed
|
||||
? "SELECT NVL(SUM(total_owners), 0) AS TotalOwners, NVL(SUM(total_comps), 0) AS TotalComps, NVL(SUM(allquantity), 0) AS AllQuantity FROM GN_TOTAL_ORDER_BY_CATEGORY t WHERE t.ct = 'PCKD'"
|
||||
: "SELECT NVL(SUM(total_owners), 0) AS TotalOwners, NVL(SUM(total_comps), 0) AS TotalComps, NVL(SUM(allquantity), 0) AS AllQuantity FROM GN_TOTAL_ORDER_BY_CATEGORY t WHERE t.ct = :Code" + (string.IsNullOrEmpty(queueType) ? string.Empty : " AND t.type = :Type");
|
||||
: "SELECT NVL(SUM(total_owners), 0) AS TotalOwners, NVL(SUM(total_comps), 0) AS TotalComps, NVL(SUM(allquantity), 0) AS AllQuantity FROM GN_TOTAL_ORDER_BY_CATEGORY t WHERE t.ct = :Code AND t.type = :Type";
|
||||
return (await QueryFirstAsync<OrderTotalsRow>(sql, new { Code = distributionCode, Type = queueType }, ct)) ?? new OrderTotalsRow();
|
||||
}
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ internal sealed class DistributionRepository(IDbSession session, ILogger<Distrib
|
|||
{
|
||||
var sql = packed
|
||||
? "SELECT NVL(SUM(used_owners), 0) AS UsedOwners, NVL(SUM(used_comps), 0) AS UsedComps FROM GN_USED_ORDER_BY_CATEGORY t WHERE t.ct = 'PCKD'"
|
||||
: "SELECT NVL(SUM(used_owners), 0) AS UsedOwners, NVL(SUM(used_comps), 0) AS UsedComps FROM GN_USED_ORDER_BY_CATEGORY t WHERE t.ct = :Code" + (string.IsNullOrEmpty(queueType) ? string.Empty : " AND t.type = :Type");
|
||||
: "SELECT NVL(SUM(used_owners), 0) AS UsedOwners, NVL(SUM(used_comps), 0) AS UsedComps FROM GN_USED_ORDER_BY_CATEGORY t WHERE t.ct = :Code AND t.type = :Type";
|
||||
return await QueryFirstAsync<OrderUsedRow>(sql, new { Code = distributionCode, Type = queueType }, ct);
|
||||
}
|
||||
|
||||
|
|
@ -405,15 +405,14 @@ internal sealed class DistributionRepository(IDbSession session, ILogger<Distrib
|
|||
public long? Scrn { get; set; }
|
||||
}
|
||||
|
||||
// legacy searchTruckDistribution reads the FIRST row of the unordered qry_truckDetails (oldest permit), not the latest
|
||||
public Task<string?> GetTruckLatestStatusCaptionAsync(string tn, CancellationToken ct = default) => QueryFirstAsync<string>("""
|
||||
SELECT s.description FROM PERMITS p, STATUS s
|
||||
WHERE p.domain = 'GN' AND p.tn = :Tn AND p.shipmentstatuscode = s.code AND s.domain = 'GN' ORDER BY p.id
|
||||
WHERE p.domain = 'GN' AND p.tn = :Tn AND p.shipmentstatuscode = s.code AND s.domain = 'GN' ORDER BY p.id DESC
|
||||
""", new { Tn = tn }, ct);
|
||||
|
||||
public Task<long?> GetTruckLatestCompanyAsync(string tn, CancellationToken ct = default) => QueryFirstAsync<long?>("""
|
||||
SELECT p.companycode FROM PERMITS p, STATUS s
|
||||
WHERE p.domain = 'GN' AND p.tn = :Tn AND p.shipmentstatuscode = s.code AND s.domain = 'GN' ORDER BY p.id
|
||||
WHERE p.domain = 'GN' AND p.tn = :Tn AND p.shipmentstatuscode = s.code AND s.domain = 'GN' ORDER BY p.id DESC
|
||||
""", new { Tn = tn }, ct);
|
||||
|
||||
public Task<IReadOnlyList<OpenOrderBrief>> GetActiveOrdersInWindowAsync(ShiftWindow window, CancellationToken ct = default) =>
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
using System.Data;
|
||||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Cards;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Cards;
|
||||
|
||||
/// <summary>REFINERY_CARDS / REFINERY_CARDS_LOG of refinery_cardsdao.cfc and refinery_cardsfactory.cfc.</summary>
|
||||
internal sealed class CardsRepository(IDbSession session, ILogger<CardsRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), ICardsRepository
|
||||
{
|
||||
private const string Columns = """
|
||||
c.ID AS Id, c.TN AS Tn, c.CARD_NUMBER AS CardNumber, c.BOX_NO AS BoxNo, c.CURRENT_BALANCE AS CurrentBalance,
|
||||
c.CREATION_DATE AS CreationDate, c.CREATED_BY AS CreatedBy, c.UPDATE_DATE AS UpdateDate, c.UPDATED_BY AS UpdatedBy,
|
||||
c.STATUS_CODE AS StatusCode, c.LAST_TRIP_ID AS LastTripId
|
||||
""";
|
||||
|
||||
public async Task<PagedResult<CardRow>> SearchAsync(CardsQuery query, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var where = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
if (!string.IsNullOrWhiteSpace(query.Tn))
|
||||
{
|
||||
// TN is a NUMBER column (legacy compared lower(TN) = lower('text')): a non-numeric text matches nothing
|
||||
if (long.TryParse(query.Tn.Trim(), out var tn)) { where.Append(" AND c.TN = :Tn"); p.Add("Tn", tn); }
|
||||
else where.Append(" AND 1 = 0");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(query.CardNumber)) { where.Append(" AND LOWER(c.CARD_NUMBER) = LOWER(:CardNumber)"); p.Add("CardNumber", query.CardNumber.Trim()); }
|
||||
var statuses = query.StatusCodes.Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => s.Trim()).Distinct().ToList();
|
||||
if (statuses.Count > 0)
|
||||
{
|
||||
var names = statuses.Select((_, i) => ":St" + i).ToList();
|
||||
where.Append($" AND c.STATUS_CODE IN ({string.Join(",", names)})");
|
||||
for (var i = 0; i < statuses.Count; i++) p.Add("St" + i, statuses[i]);
|
||||
}
|
||||
var baseSql = $"SELECT {Columns} FROM REFINERY_CARDS c{where}";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<CardRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<CardRow>(OracleSql.Paginate(baseSql + " ORDER BY c.ID DESC"), p, ct);
|
||||
return new PagedResult<CardRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public Task<CardRow?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<CardRow>($"SELECT {Columns} FROM REFINERY_CARDS c WHERE c.ID = :Id", new { Id = id }, ct);
|
||||
|
||||
public async Task<bool> CardNumberExistsAsync(string cardNumber, CancellationToken ct = default) =>
|
||||
await ExecuteScalarAsync<long>("SELECT COUNT(*) FROM REFINERY_CARDS WHERE CARD_NUMBER = :CardNumber", new { CardNumber = cardNumber }, ct) > 0;
|
||||
|
||||
public Task<IReadOnlyList<CardRow>> GetByTruckAsync(long tn, CancellationToken ct = default) =>
|
||||
QueryAsync<CardRow>($"SELECT {Columns} FROM REFINERY_CARDS c WHERE c.TN = :Tn ORDER BY c.ID DESC", new { Tn = tn }, ct);
|
||||
|
||||
public async Task<long> InsertAsync(long tn, string cardNumber, decimal balance, string createdBy, CancellationToken ct = default)
|
||||
{
|
||||
// BOX_NO is always 0 (refinery_cardsfactory.cfc:167); STATUS_CODE and CREATION_DATE come from the column defaults (ACTIVE, SYSDATE)
|
||||
var p = new DynamicParameters(new { Tn = tn, CardNumber = cardNumber, Balance = balance, CreatedBy = Fit(createdBy, 20) });
|
||||
p.Add("NewId", dbType: DbType.Int64, direction: ParameterDirection.Output);
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_CARDS (ID, TN, CARD_NUMBER, BOX_NO, CURRENT_BALANCE, CREATED_BY)
|
||||
VALUES (SEQ_REFINERY_CARDS.NEXTVAL, :Tn, :CardNumber, 0, :Balance, :CreatedBy)
|
||||
RETURNING ID INTO :NewId
|
||||
""", p, ct);
|
||||
return OracleSql.ToInt64(p.Get<object>("NewId"));
|
||||
}
|
||||
|
||||
public Task ChangeStatusAsync(long id, string status, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_CARDS SET STATUS_CODE = :Status, UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId WHERE ID = :Id
|
||||
""", new { Status = status, UserId = Fit(userId, 20), Id = id }, ct);
|
||||
|
||||
public Task InsertLogAsync(long cardId, string method, decimal balanceBefore, decimal balanceAfter, decimal amount, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_CARDS_LOG (ID, ENTITIY_ID, METHOD_NAME, BALANCE_BEFORE, BALANCE_AFTER, AMOUNT, PN, CREATED_BY, LAST_UPDATE_DATE, UPDATED_BY)
|
||||
VALUES (SEQ_REFINERY_CARDS_LOG.NEXTVAL, :CardId, :Method, :Before, :After, :Amount, '0', :UserId, SYSDATE, :UserId)
|
||||
""", new { CardId = cardId, Method = method, Before = balanceBefore, After = balanceAfter, Amount = amount, UserId = Fit(userId, 50) }, ct);
|
||||
|
||||
public async Task<PagedResult<CardLogRow>> GetLogAsync(long cardId, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
const string baseSql = """
|
||||
SELECT l.ID AS Id, l.ENTITIY_ID AS EntityId, l.METHOD_NAME AS MethodName, l.BALANCE_BEFORE AS BalanceBefore,
|
||||
l.BALANCE_AFTER AS BalanceAfter, l.AMOUNT AS Amount, l.PN AS Pn, l.UPDATED_BY AS UpdatedBy, l.LAST_UPDATE_DATE AS LastUpdateDate
|
||||
FROM REFINERY_CARDS_LOG l WHERE l.ENTITIY_ID = :CardId
|
||||
""";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), new { CardId = cardId }, ct);
|
||||
if (total == 0) return new PagedResult<CardLogRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
var items = await QueryAsync<CardLogRow>(OracleSql.Paginate(baseSql + " ORDER BY l.ID DESC"),
|
||||
new { CardId = cardId, page.MinRow, page.MaxRow }, ct);
|
||||
return new PagedResult<CardLogRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
private static string Fit(string value, int max) => value.Length <= max ? value : value[..max];
|
||||
}
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.CommissionClaims;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.CommissionClaims;
|
||||
|
||||
/// <summary>Dapper port of refinery_commission_claimdao.cfc and the SQL of refinery_commission_claimfactory.cfc (NAFITHTCS connection).</summary>
|
||||
internal sealed class CommissionClaimRepository(IDbSession session, ILogger<CommissionClaimRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), ICommissionClaimRepository
|
||||
{
|
||||
// REFINERY_COMMISSION_CLAIM_VIEW (trip_cnt = number of wage claims of the commission claim)
|
||||
private const string ClaimSelect = """
|
||||
SELECT c.ID AS Id, c.COMMISSION_CLAIM_NO AS CommissionClaimNo, c.COMMISSION_CLAIM_DATE AS CommissionClaimDate, c.STATUS_CODE AS StatusCode,
|
||||
(SELECT COUNT(*) FROM REFINERY_WAGE_CLAIM w WHERE w.COMMISSION_CLAIM_ID = c.ID) AS TripCnt
|
||||
FROM REFINERY_COMMISSION_CLAIM c
|
||||
""";
|
||||
|
||||
private const string WageClaimSelect = """
|
||||
SELECT w.ID AS Id, w.WAGE_CLAIM_NO AS WageClaimNo, w.WAGE_CLAIM_DATE AS WageClaimDate, w.STATUS_CODE AS StatusCode,
|
||||
w.COMMISSION_CLAIM_ID AS CommissionClaimId,
|
||||
(SELECT COUNT(*) FROM REFINERY_TRIPS t WHERE t.WAGE_CLAIM_ID = w.ID) AS TripCnt
|
||||
FROM REFINERY_WAGE_CLAIM w
|
||||
""";
|
||||
|
||||
private static string I(long v) => v.ToString(CultureInfo.InvariantCulture);
|
||||
|
||||
public async Task<PagedResult<CommissionClaimRowDto>> SearchAsync(CommissionClaimQuery q, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var where = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
if (!string.IsNullOrWhiteSpace(q.CommissionClaimNo)) { where.Append(" AND TO_CHAR(c.COMMISSION_CLAIM_NO) = :No"); p.Add("No", q.CommissionClaimNo.Trim()); }
|
||||
if (q.CommissionClaimDate is { } d)
|
||||
{
|
||||
where.Append(" AND c.COMMISSION_CLAIM_DATE >= :DayFrom AND c.COMMISSION_CLAIM_DATE < :DayTo");
|
||||
p.Add("DayFrom", d.ToDateTime(TimeOnly.MinValue));
|
||||
p.Add("DayTo", d.AddDays(1).ToDateTime(TimeOnly.MinValue));
|
||||
}
|
||||
if (q.StatusCodes.Count > 0) where.Append(" AND c.STATUS_CODE IN (").Append(AddList(p, "St", q.StatusCodes)).Append(')');
|
||||
|
||||
var baseSql = ClaimSelect + where;
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<CommissionClaimRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
// legacy sort: COMMISSION_CLAIM_NO ASC
|
||||
var items = await QueryAsync<CommissionClaimRowDto>(OracleSql.Paginate(baseSql + " ORDER BY c.COMMISSION_CLAIM_NO, c.ID"), p, ct);
|
||||
return new PagedResult<CommissionClaimRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public Task<CommissionClaimRowDto?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<CommissionClaimRowDto>(ClaimSelect + " WHERE c.ID = :Id", new { Id = id }, ct);
|
||||
|
||||
public async Task<IReadOnlyList<WageClaimRowDto>> WageClaimsOfAsync(long commissionClaimId, CancellationToken ct = default) =>
|
||||
await QueryAsync<WageClaimRowDto>(WageClaimSelect + " WHERE w.COMMISSION_CLAIM_ID = :Id ORDER BY w.WAGE_CLAIM_NO, w.ID", new { Id = commissionClaimId }, ct);
|
||||
|
||||
public async Task<IReadOnlyList<WageClaimRowDto>> CandidateWageClaimsAsync(IReadOnlyList<string> statuses, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
var sql = WageClaimSelect + " WHERE w.COMMISSION_CLAIM_ID IS NULL AND w.STATUS_CODE IN (" + AddList(p, "St", statuses) + ") ORDER BY w.WAGE_CLAIM_NO, w.ID";
|
||||
return await QueryAsync<WageClaimRowDto>(sql, p, ct);
|
||||
}
|
||||
|
||||
public Task<int> CountAttachableAsync(IReadOnlyList<long> wageClaimIds, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
return ExecuteScalarAsync<int>("SELECT COUNT(*) FROM REFINERY_WAGE_CLAIM w WHERE w.COMMISSION_CLAIM_ID IS NULL AND w.ID IN (" + AddIdList(p, wageClaimIds) + ")", p, ct);
|
||||
}
|
||||
|
||||
public async Task<long> InsertAsync(string createdBy, CancellationToken ct = default)
|
||||
{
|
||||
await ExecuteAsync("LOCK TABLE REFINERY_COMMISSION_CLAIM IN SHARE ROW EXCLUSIVE MODE", null, ct);
|
||||
var id = await ExecuteScalarAsync<long>("SELECT SEQ_REFINERY_COMMISSION_CLAIM.NEXTVAL FROM DUAL", null, ct);
|
||||
// GenerateSerialNumber('REFINERY_COMMISSION_CLAIM'): yyyy + '02' + 5 digits for the first claim of the year, then max + 1
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_COMMISSION_CLAIM (ID, COMMISSION_CLAIM_NO, STATUS_CODE, CREATED_BY)
|
||||
SELECT :Id,
|
||||
NVL(MAX(t.COMMISSION_CLAIM_NO) + 1, TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY') || '02' || '00001')),
|
||||
'NEW', :CreatedBy
|
||||
FROM REFINERY_COMMISSION_CLAIM t
|
||||
WHERE TO_CHAR(t.COMMISSION_CLAIM_DATE, 'yyyy') = TO_CHAR(SYSDATE, 'YYYY')
|
||||
""", new { Id = id, CreatedBy = createdBy }, ct);
|
||||
return id;
|
||||
}
|
||||
|
||||
public Task<int> AttachWageClaimsAsync(long commissionClaimId, IReadOnlyList<long> wageClaimIds, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
p.Add("ClaimId", commissionClaimId);
|
||||
return ExecuteAsync("UPDATE REFINERY_WAGE_CLAIM SET COMMISSION_CLAIM_ID = :ClaimId WHERE COMMISSION_CLAIM_ID IS NULL AND ID IN (" + AddIdList(p, wageClaimIds) + ")", p, ct);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<string>> WageClaimStatusesAsync(long commissionClaimId, CancellationToken ct = default) =>
|
||||
await QueryAsync<string>("SELECT STATUS_CODE FROM REFINERY_WAGE_CLAIM WHERE COMMISSION_CLAIM_ID = :Id", new { Id = commissionClaimId }, ct);
|
||||
|
||||
public async Task<int> CompleteWageClaimsAsync(long commissionClaimId, string userLogin, long userId, string? ip, CancellationToken ct = default)
|
||||
{
|
||||
// legacy: raw 'CLOSE' / 'COMPLETE' (not JSON) in OLD_DATA / NEW_DATA, ids from SEQ_LOG_REFINERY_WAGE_CLAIM
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_WAGE_CLAIM_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
SELECT SEQ_LOG_REFINERY_WAGE_CLAIM.NEXTVAL, w.ID, 'COMPLETE', SYSDATE, :UserId, :Ip, 'CLOSE', 'COMPLETE'
|
||||
FROM REFINERY_WAGE_CLAIM w WHERE w.COMMISSION_CLAIM_ID = :Id AND w.STATUS_CODE = 'CLOSE'
|
||||
""", new { UserId = I(userId), Ip = Cut(ip, 50), Id = commissionClaimId }, ct);
|
||||
return await ExecuteAsync("""
|
||||
UPDATE REFINERY_WAGE_CLAIM SET STATUS_CODE = 'COMPLETE', LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserLogin
|
||||
WHERE COMMISSION_CLAIM_ID = :Id AND STATUS_CODE = 'CLOSE'
|
||||
""", new { UserLogin = userLogin, Id = commissionClaimId }, ct);
|
||||
}
|
||||
|
||||
public Task SetStatusAsync(long id, string status, string userLogin, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_COMMISSION_CLAIM SET STATUS_CODE = :Status, LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserLogin WHERE ID = :Id
|
||||
""", new { Status = status, UserLogin = userLogin, Id = id }, ct);
|
||||
|
||||
public Task AddLogAsync(long id, string method, string? oldData, string? newData, long userId, string? ip, CancellationToken ct = default) =>
|
||||
// legacy takes the ids of this log from SEQ_REFINERY_TRIPS_LOG (saveLog was called with that sequence name)
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_COMMISSION_CLAIM_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
VALUES (SEQ_REFINERY_TRIPS_LOG.NEXTVAL, :Id, :Method, SYSDATE, :UserId, :Ip, :OldData, :NewData)
|
||||
""", new { Id = id, Method = method, UserId = I(userId), Ip = Cut(ip, 50), OldData = oldData, NewData = newData }, ct);
|
||||
|
||||
public async Task<PagedResult<ClaimLogRowDto>> LogAsync(long id, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
p.Add("Id", id);
|
||||
var total = await ExecuteScalarAsync<long>("SELECT COUNT(*) FROM REFINERY_COMMISSION_CLAIM_LOG WHERE ENTITIY_ID = :Id", p, ct);
|
||||
if (total == 0) return new PagedResult<ClaimLogRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<ClaimLogRowDto>(OracleSql.Paginate("""
|
||||
SELECT t.ID AS Id, t.METHOD_NAME AS MethodName, t.LOG_DATE AS LogDate,
|
||||
(SELECT MIN(n.LOGIN) FROM NTP.NTPUSERS n WHERE TO_CHAR(n.ID) = t.USER_ID) AS Login,
|
||||
DBMS_LOB.SUBSTR(t.OLD_DATA, 4000, 1) AS OldData, DBMS_LOB.SUBSTR(t.NEW_DATA, 4000, 1) AS NewData
|
||||
FROM REFINERY_COMMISSION_CLAIM_LOG t WHERE t.ENTITIY_ID = :Id ORDER BY t.ID DESC
|
||||
"""), p, ct);
|
||||
return new PagedResult<ClaimLogRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public async Task<CommissionInvoiceSource?> InvoiceSourceAsync(long id, CancellationToken ct = default) =>
|
||||
await QueryFirstAsync<CommissionInvoiceSource>("""
|
||||
SELECT c.COMMISSION_CLAIM_NO AS CommissionClaimNo,
|
||||
(SELECT MAX(w.WAGE_CLAIM_DATE) KEEP (DENSE_RANK LAST ORDER BY w.ID) FROM REFINERY_WAGE_CLAIM w WHERE w.COMMISSION_CLAIM_ID = c.ID) AS NewestWageClaimDate,
|
||||
(SELECT COUNT(*) FROM REFINERY_TRIPS t WHERE t.WAGE_CLAIM_ID IN (SELECT w.ID FROM REFINERY_WAGE_CLAIM w WHERE w.COMMISSION_CLAIM_ID = c.ID)) AS TripsCount
|
||||
FROM REFINERY_COMMISSION_CLAIM c WHERE c.ID = :Id
|
||||
""", new { Id = id }, ct);
|
||||
|
||||
public async Task<decimal?> CommissionVariableAsync(int month, int year, CancellationToken ct = default) =>
|
||||
// legacy test, kept as is: the month lies between the months of start / end date and the year between the years of start / end date
|
||||
await QueryFirstAsync<decimal?>("""
|
||||
SELECT * FROM (
|
||||
SELECT v.KEY_VALUE FROM REFINERY_VARIABLES v
|
||||
WHERE v.KEY_NAME = 'COMMISSION'
|
||||
AND :Mo BETWEEN EXTRACT(MONTH FROM v.START_DATE) AND EXTRACT(MONTH FROM v.END_DATE)
|
||||
AND :Yr BETWEEN EXTRACT(YEAR FROM v.START_DATE) AND EXTRACT(YEAR FROM v.END_DATE)
|
||||
ORDER BY v.START_DATE DESC) WHERE ROWNUM = 1
|
||||
""", new { Mo = month, Yr = year }, ct);
|
||||
|
||||
private static string AddList(DynamicParameters p, string prefix, IEnumerable<string> values)
|
||||
{
|
||||
var names = new List<string>();
|
||||
foreach (var v in values) { var n = prefix + names.Count; p.Add(n, v); names.Add(":" + n); }
|
||||
return string.Join(", ", names);
|
||||
}
|
||||
|
||||
private static string AddIdList(DynamicParameters p, IEnumerable<long> ids)
|
||||
{
|
||||
var names = new List<string>();
|
||||
foreach (var v in ids) { var n = "Wid" + names.Count; p.Add(n, v); names.Add(":" + n); }
|
||||
return string.Join(", ", names);
|
||||
}
|
||||
|
||||
private static string? Cut(string? s, int max) => s is null ? null : s.Length <= max ? s : s[..max];
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
using System.Globalization;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.RemainingBalance;
|
||||
|
||||
/// <summary>Port of refinery_remaining_balanceDAO.cfc (REFINERY_REMAINING_BALANCE, REFINERY_REMAINING_BALANCE_LOG).</summary>
|
||||
internal sealed class RemainingBalanceRepository(IDbSession session, ILogger<RemainingBalanceRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), IRemainingBalanceRepository
|
||||
{
|
||||
private static bool TryTruck(string tn, out long truck) => long.TryParse(tn, NumberStyles.Integer, CultureInfo.InvariantCulture, out truck);
|
||||
private static long Truck(string tn) => long.Parse(tn, CultureInfo.InvariantCulture);
|
||||
|
||||
public async Task<RemainingBalanceRow?> GetByTruckAsync(string tn, CancellationToken ct = default) =>
|
||||
TryTruck(tn, out var truck)
|
||||
? await QueryFirstAsync<RemainingBalanceRow>(
|
||||
"SELECT ID AS Id, TN AS Tn, ROUND(REMAINING_BALANCE, 3) AS RemainingBalance, ROUND(BEFORE_REMAINING_BALANCE, 3) AS BeforeRemainingBalance " +
|
||||
"FROM REFINERY_REMAINING_BALANCE WHERE TN = :Tn ORDER BY ID", new { Tn = truck }, ct)
|
||||
: null;
|
||||
|
||||
public Task ZeroAsync(string tn, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_REMAINING_BALANCE SET BEFORE_REMAINING_BALANCE = REMAINING_BALANCE, REMAINING_BALANCE = 0,
|
||||
LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId
|
||||
WHERE TN = :Tn
|
||||
""", new { UserId = userId, Tn = Truck(tn) }, ct);
|
||||
|
||||
public async Task<bool> AddAsync(string tn, decimal delta, string userId, CancellationToken ct = default) =>
|
||||
await ExecuteAsync("""
|
||||
UPDATE REFINERY_REMAINING_BALANCE SET BEFORE_REMAINING_BALANCE = REMAINING_BALANCE,
|
||||
REMAINING_BALANCE = REMAINING_BALANCE + :Delta, LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId
|
||||
WHERE TN = :Tn
|
||||
""", new { Delta = delta, UserId = userId, Tn = Truck(tn) }, ct) > 0;
|
||||
|
||||
public Task CreateAsync(string tn, decimal balance, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_REMAINING_BALANCE (ID, TN, REMAINING_BALANCE, CREATION_DATE, CREATED_BY, BEFORE_REMAINING_BALANCE)
|
||||
VALUES (SEQ_REFINERY_REMAINING_BALANCE.NEXTVAL, :Tn, :Balance, SYSDATE, :UserId, 0)
|
||||
""", new { Tn = Truck(tn), Balance = balance, UserId = userId }, ct);
|
||||
|
||||
public Task InsertLogAsync(long balanceId, decimal amount, decimal balanceBefore, long tripId, long? variableGroupId, string loginId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_REMAINING_BALANCE_LOG (ID, ENTITIY_ID, AMOUNT, BALANCE_BEFORE, TRIP_ID, REF_VARIABLES_GROUP_ID, CREATED_BY, CREATION_DATE)
|
||||
VALUES (SEQ_REF_REMAINING_BALANCE_LOG.NEXTVAL, :BalanceId, :Amount, :Before, :TripId, :GroupId, :LoginId, SYSDATE)
|
||||
""", new { BalanceId = balanceId, Amount = amount, Before = balanceBefore, TripId = tripId, GroupId = variableGroupId, LoginId = loginId }, ct);
|
||||
}
|
||||
|
|
@ -1,412 +0,0 @@
|
|||
using System.Globalization;
|
||||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
using Oracle.ManagedDataAccess.Client;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Trips;
|
||||
|
||||
/// <summary>
|
||||
/// Port of refinerytripdao.cfc on REFINERY_TRIPS / REFINERY_TRIPS_VIEW (the legacy view is reused for the grid, the form and the reports:
|
||||
/// it joins wallets, cards, driver, wage claim and the paid wallet). Money columns are ROUNDed to 3 decimals in SQL where ODP.NET could
|
||||
/// meet a 38-digit float (CalculateRefinary* return FLOAT, REFINERY_CARDS.CURRENT_BALANCE is an unconstrained NUMBER).
|
||||
/// </summary>
|
||||
internal sealed class TripRepository(IDbSession session, IHttpContextAccessor http, ILogger<TripRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), ITripRepository
|
||||
{
|
||||
private static bool? _hasWaterFlag;
|
||||
|
||||
private sealed class LockRow { public string? StatusCode { get; set; } public int DieselCharge { get; set; } }
|
||||
private sealed class CardRowDb { public long Id { get; set; } public decimal CurrentBalance { get; set; } }
|
||||
private sealed class VariableRow { public string KeyName { get; set; } = string.Empty; public string? KeyValue { get; set; } }
|
||||
|
||||
// ------------------------------------------------------------------ filters (legacy common.getGridData on the view)
|
||||
private static List<string> SplitList(string? list) =>
|
||||
(list ?? string.Empty).Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).ToList();
|
||||
|
||||
private static void AddIn(StringBuilder sql, DynamicParameters p, string column, string prefix, IReadOnlyList<string> values, bool numeric)
|
||||
{
|
||||
if (values.Count == 0) return;
|
||||
if (numeric)
|
||||
{
|
||||
var nums = values.Select(v => decimal.TryParse(v, NumberStyles.Any, CultureInfo.InvariantCulture, out var d) ? (decimal?)d : null).ToList();
|
||||
if (nums.Any(n => n is null)) { sql.Append(" AND 1 = 0"); return; }
|
||||
var names = new List<string>();
|
||||
for (var i = 0; i < nums.Count; i++) { p.Add($"{prefix}{i}", nums[i]!.Value); names.Add($":{prefix}{i}"); }
|
||||
sql.Append($" AND {column} IN ({string.Join(", ", names)})");
|
||||
}
|
||||
else
|
||||
{
|
||||
var names = new List<string>();
|
||||
for (var i = 0; i < values.Count; i++) { p.Add($"{prefix}{i}", values[i]); names.Add($":{prefix}{i}"); }
|
||||
sql.Append($" AND {column} IN ({string.Join(", ", names)})");
|
||||
}
|
||||
}
|
||||
|
||||
private static (string Where, DynamicParameters P) Filter(TripQuery q)
|
||||
{
|
||||
var sql = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
if (q.Id is { } id) { sql.Append(" AND p.ID = :Id"); p.Add("Id", id); }
|
||||
if (!string.IsNullOrWhiteSpace(q.Pn)) { sql.Append(" AND LOWER(p.PN) = LOWER(:Pn)"); p.Add("Pn", q.Pn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.Tn)) { sql.Append(" AND p.TN = :Tn"); p.Add("Tn", q.Tn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.Trn)) { sql.Append(" AND LOWER(p.TRN) = LOWER(:Trn)"); p.Add("Trn", q.Trn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.Nnpn)) { sql.Append(" AND p.NNPN = :Nnpn"); p.Add("Nnpn", q.Nnpn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.LoadingNo))
|
||||
{
|
||||
if (long.TryParse(q.LoadingNo.Trim(), out var ln)) { sql.Append(" AND p.LOADING_NO = :LoadingNo"); p.Add("LoadingNo", ln); }
|
||||
else sql.Append(" AND 1 = 0");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(q.DischargeAuthNo)) { sql.Append(" AND p.DISCHARGE_AUTHORIZTION_NO = :DischargeAuthNo"); p.Add("DischargeAuthNo", q.DischargeAuthNo.Trim()); }
|
||||
if (q.DispatchDate is { } dd) { sql.Append(" AND p.DISPATCH_DATE = :DispatchDate"); p.Add("DispatchDate", dd.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture)); }
|
||||
if (q.DischargeEntryDate is { } de)
|
||||
{
|
||||
sql.Append(" AND p.DISCHARGE_ENTRY_DATE >= :DeFrom AND p.DISCHARGE_ENTRY_DATE < :DeTo");
|
||||
p.Add("DeFrom", de.Date); p.Add("DeTo", de.Date.AddDays(1));
|
||||
}
|
||||
if (q.LoadingDateFrom is { } lf) { sql.Append(" AND p.LOADING_DATE >= :LdFrom"); p.Add("LdFrom", lf.Date); }
|
||||
if (q.LoadingDateTo is { } lt) { sql.Append(" AND p.LOADING_DATE < :LdTo"); p.Add("LdTo", lt.Date.AddDays(1)); }
|
||||
if (q.PaymentedDateFrom is { } pf) { sql.Append(" AND p.PAYMENTED_DATE >= :PdFrom"); p.Add("PdFrom", pf.Date); }
|
||||
if (q.PaymentedDateTo is { } pt) { sql.Append(" AND p.PAYMENTED_DATE < :PdTo"); p.Add("PdTo", pt.Date.AddDays(1)); }
|
||||
AddIn(sql, p, "p.STATUS_CODE", "St", SplitList(q.StatusCode), numeric: false);
|
||||
AddIn(sql, p, "p.PAYMENT_METHOD_CODE", "Pm", SplitList(q.PaymentMethodCode), numeric: true);
|
||||
AddIn(sql, p, "p.DIESEL_CHARGE", "Dc", SplitList(q.DieselCharge), numeric: true);
|
||||
if (!string.IsNullOrWhiteSpace(q.HasWageClaim)) { sql.Append(" AND p.HAS_WAGE_CLAIM = :HasWageClaim"); p.Add("HasWageClaim", q.HasWageClaim.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.HavePaymentMethod)) { sql.Append(" AND p.HAVE_PAYMENT_METHOD = :HavePm"); p.Add("HavePm", q.HavePaymentMethod.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.WageClaimNo))
|
||||
{
|
||||
if (long.TryParse(q.WageClaimNo.Trim(), out var wn)) { sql.Append(" AND p.WAGE_CLAIM_NO = :WageClaimNo"); p.Add("WageClaimNo", wn); }
|
||||
else sql.Append(" AND 1 = 0");
|
||||
}
|
||||
if (q.WageClaimId is { } wid) { sql.Append(" AND p.WAGE_CLAIM_ID = :WageClaimId"); p.Add("WageClaimId", wid); }
|
||||
if (!string.IsNullOrWhiteSpace(q.BankAccount)) { sql.Append(" AND LOWER(p.BANK_ACCOUNT) = LOWER(:BankAccount)"); p.Add("BankAccount", q.BankAccount.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.WaterExist))
|
||||
{
|
||||
if (int.TryParse(q.WaterExist.Trim(), out var we)) { sql.Append(" AND p.WATER_EXIST = :WaterExist"); p.Add("WaterExist", we); }
|
||||
else sql.Append(" AND 1 = 0");
|
||||
}
|
||||
return (sql.ToString(), p);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ grid
|
||||
private const string GridSelect = """
|
||||
SELECT p.ID AS Id, p.PN AS Pn, p.DISPATCH_DATE AS DispatchDate, p.LOADING_NO AS LoadingNo,
|
||||
p.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthNo, p.DISCHARGE_ENTRY_DATE_DISPLAY AS DischargeEntryDate,
|
||||
p.TN AS Tn, p.TRN AS Trn, p.NNPN AS Nnpn, p.WAGE_CLAIM_ID AS WageClaimId, p.WAGE_CLAIM_NO AS WageClaimNo,
|
||||
p.STATUS_CODE AS StatusCode, p.DIESEL_CHARGE AS DieselCharge, p.HAVE_PAYMENT_METHOD AS HavePaymentMethod,
|
||||
p.WATER_AMOUNT AS WaterAmount, p.REVERSE_PAYMENT AS ReversePayment, p.NET_WAGE AS NetWage
|
||||
FROM REFINERY_TRIPS_VIEW p
|
||||
""";
|
||||
|
||||
public async Task<PagedResult<TripRow>> SearchAsync(TripQuery query, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var (where, p) = Filter(query);
|
||||
var sql = GridSelect + where;
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(sql), p, ct);
|
||||
if (total == 0) return new PagedResult<TripRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<TripRow>(OracleSql.Paginate(sql + " ORDER BY p.ID DESC"), p, ct);
|
||||
return new PagedResult<TripRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ one trip
|
||||
private const string RecordSelect = """
|
||||
SELECT t.ID AS Id, t.PN AS Pn, t.STATUS_CODE AS StatusCode, t.DISPATCH_DATE AS DispatchDate,
|
||||
t.ACTUAL_LOADING_DATE AS ActualLoadingDate, t.LOADING_DATE AS LoadingDate, t.CLIENT_NAME AS ClientName,
|
||||
t.TN AS Tn, t.TRN AS Trn, t.NNPN AS Nnpn, t.DRVR AS Drvr, t.LOADING_NO AS LoadingNo,
|
||||
t.GROSS_WEIGHT AS GrossWeight, t.EMPTY_WEIGHT AS EmptyWeight, t.NET_LOADING_WEIGHT AS NetLoadingWeight,
|
||||
t.LITERS_WEIGHT AS LitersWeight, t.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthNo,
|
||||
t.DISCHARGE_ENTRY_DATE_DISPLAY AS DischargeEntryDate, t.ACTUAL_GROSS_WEIGHT AS ActualGrossWeight,
|
||||
t.ACTUAL_EMPTY_WEIGHT AS ActualEmptyWeight, t.NET_DISCHARGE_WEIGHT AS NetDischargeWeight,
|
||||
t.WATER_AMOUNT AS WaterAmount, t.SEDIMENT_AMOUNT AS SedimentAmount, t.WEIGHT_DIIERANCE AS WeightDifference,
|
||||
t.NET_WAGE AS NetWage, t.TRIP_NET_WAGE AS TripNetWage, t.REMAINING_BALANCE AS RemainingBalance,
|
||||
t.DIESEL_CHARGE AS DieselCharge, t.REVERSE_PAYMENT AS ReversePayment, t.FIRST_ADVANCE_PAYMENT AS FirstAdvancePayment,
|
||||
t.SECOND_ADVANCE_PAYMENT AS SecondAdvancePayment, t.PENALTY_AMOUNT AS PenaltyAmount, t.PENALTY_QUANTITY AS PenaltyQuantity,
|
||||
t.HAVE_PAYMENT_METHOD AS HavePaymentMethod, t.DRIVER_WALLET_NUMBER AS DriverWalletNumber,
|
||||
t.WAGE_CLAIM_ID AS WageClaimId, t.WAGE_CLAIM_NO AS WageClaimNo, t.CARD_NUMBER AS CardNumber,
|
||||
ROUND(t.CURRENT_BALANCE, 3) AS CurrentBalance, t.REFINERY_WALLET_ID AS RefineryWalletId,
|
||||
t.DINARAK_REFERENCE_ID AS DinarakReferenceId, t.REMARKS AS Remarks, t.RECEIVED_BY_NAME AS ReceivedByName,
|
||||
t.RECEIVED_DATE AS ReceivedDate, t.PAYMENTED_DATE AS PaymentedDate, t.PAYMENT_OPTIONS AS PaymentOptions,
|
||||
t.VOUCHER_SERIAL_NUMBER AS VoucherSerialNumber, t.PAID_EPAYMENT AS PaidEpayment, t.PAYMENT_METHOD AS PaymentMethod,
|
||||
t.OWNER_NAME AS OwnerName
|
||||
FROM REFINERY_TRIPS_VIEW t
|
||||
""";
|
||||
|
||||
public Task<TripRecord?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<TripRecord>(RecordSelect + " WHERE t.ID = :Id", new { Id = id }, ct);
|
||||
|
||||
public async Task<TripLock?> LockAsync(long id, CancellationToken ct = default)
|
||||
{
|
||||
var r = await QueryFirstAsync<LockRow>(
|
||||
"SELECT STATUS_CODE AS StatusCode, DIESEL_CHARGE AS DieselCharge FROM REFINERY_TRIPS WHERE ID = :Id FOR UPDATE", new { Id = id }, ct);
|
||||
return r is null ? null : new TripLock(r.StatusCode, r.DieselCharge);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<TripRecord>> GetTripsOfPeriodAsync(DateTime from, DateTime to, CancellationToken ct = default) =>
|
||||
await QueryAsync<TripRecord>(RecordSelect + " WHERE t.LOADING_DATE >= :From AND t.LOADING_DATE < :To ORDER BY t.ID",
|
||||
new { From = from.Date, To = to.Date.AddDays(1) }, ct);
|
||||
|
||||
// ------------------------------------------------------------------ wallets / variables
|
||||
private const string WalletSelect = """
|
||||
SELECT ID AS Id, EPAYMENT AS Epayment, WALLET_NUMBER AS WalletNumber, OWNER_NNPN AS OwnerNnpn, OWNER_NAME AS OwnerName,
|
||||
DRIVER_NAME AS DriverName, DRIVER_NNPN AS DriverNnpn, BANK_ACCOUNT AS BankAccount, IBAN AS Iban, BANK_NAME AS BankName
|
||||
FROM REFINERY_WALLET
|
||||
""";
|
||||
|
||||
public async Task<TripWallet?> GetActiveWalletByTruckAsync(string tn, CancellationToken ct = default) =>
|
||||
long.TryParse(tn, out var truck)
|
||||
? await QueryFirstAsync<TripWallet>(WalletSelect + " WHERE TN = :Tn AND STATUS_CODE = 'ACTIVE' ORDER BY ID DESC", new { Tn = truck }, ct)
|
||||
: null;
|
||||
|
||||
public Task<TripWallet?> GetWalletAsync(long walletId, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<TripWallet>(WalletSelect + " WHERE ID = :Id", new { Id = walletId }, ct);
|
||||
|
||||
public async Task<bool> GetAuditModeAsync(CancellationToken ct = default)
|
||||
{
|
||||
var v = await QueryFirstAsync<string>(
|
||||
"SELECT KEY_VALUE FROM (SELECT KEY_VALUE FROM REFINERY_VARIABLES WHERE KEY_NAME = 'AUTDIT_MODE' ORDER BY ID DESC) WHERE ROWNUM = 1", null, ct);
|
||||
return v?.Trim() == "1";
|
||||
}
|
||||
|
||||
public async Task<decimal?> GetFirstPaymentValueAsync(CancellationToken ct = default)
|
||||
{
|
||||
var v = await QueryFirstAsync<string>(
|
||||
"SELECT KEY_VALUE FROM (SELECT KEY_VALUE FROM REFINERY_VARIABLES WHERE KEY_NAME = 'FIRST_ADVANCE_PAYMENT' " +
|
||||
"AND SYSDATE BETWEEN START_DATE AND END_DATE ORDER BY ID DESC) WHERE ROWNUM = 1", null, ct);
|
||||
return decimal.TryParse(v?.Trim(), NumberStyles.Number, CultureInfo.InvariantCulture, out var d) ? d : null;
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<KeyValuePair<string, string?>>> GetVariablesAsync(DateTime loadingDate, CancellationToken ct = default)
|
||||
{
|
||||
var rows = await QueryAsync<VariableRow>(
|
||||
"SELECT KEY_NAME AS KeyName, KEY_VALUE AS KeyValue FROM REFINERY_VARIABLES WHERE :D BETWEEN START_DATE AND END_DATE ORDER BY ID",
|
||||
new { D = loadingDate.Date }, ct);
|
||||
return rows.Select(r => new KeyValuePair<string, string?>(r.KeyName, r.KeyValue)).ToList();
|
||||
}
|
||||
|
||||
/// <summary>WATER_FLAG is written by the legacy import job of a newer release; this database may not have the column yet.</summary>
|
||||
public async Task<int?> GetWaterFlagAsync(long id, CancellationToken ct = default)
|
||||
{
|
||||
_hasWaterFlag ??= await ExecuteScalarAsync<long>(
|
||||
"SELECT COUNT(*) FROM USER_TAB_COLUMNS WHERE TABLE_NAME = 'REFINERY_TRIPS' AND COLUMN_NAME = 'WATER_FLAG'", null, ct) > 0;
|
||||
if (_hasWaterFlag != true) return null;
|
||||
return await QueryFirstAsync<int?>("SELECT WATER_FLAG FROM REFINERY_TRIPS WHERE ID = :Id", new { Id = id }, ct);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ DB functions
|
||||
private async Task<decimal?> FunctionAsync(string sql, long id, CancellationToken ct)
|
||||
{
|
||||
try { return await QueryFirstAsync<decimal?>(sql, new { Id = id }, ct); }
|
||||
catch (OracleException ex) when (ex.Number == 1403) { return null; } // no price for the date: NO_DATA_FOUND inside the function
|
||||
}
|
||||
|
||||
public Task<decimal?> CalculateDieselAsync(long id, CancellationToken ct = default) =>
|
||||
FunctionAsync("SELECT ROUND(CalculateRefinaryDiesel(:Id), 3) FROM DUAL", id, ct);
|
||||
|
||||
public Task<decimal?> CalculateAmountAsync(long id, CancellationToken ct = default) =>
|
||||
FunctionAsync("SELECT ROUND(CalculateRefinaryAmount(:Id), 3) FROM DUAL", id, ct);
|
||||
|
||||
public async Task<bool> HasTransferLogAsync(long id, CancellationToken ct = default) =>
|
||||
await ExecuteScalarAsync<long>("SELECT COUNT(*) FROM REFINERY_DINARAK_API_LOG WHERE REFINERY_TRIP_ID = :Id AND SERVICE_NAME = 'TRANSFER'", new { Id = id }, ct) > 0;
|
||||
|
||||
// ------------------------------------------------------------------ diesel cards
|
||||
public async Task<CardInfo?> GetActiveCardAsync(string tn, CancellationToken ct = default)
|
||||
{
|
||||
if (!long.TryParse(tn, out var truck)) return null;
|
||||
var r = await QueryFirstAsync<CardRowDb>(
|
||||
"SELECT ID AS Id, ROUND(CURRENT_BALANCE, 3) AS CurrentBalance FROM REFINERY_CARDS WHERE TN = :Tn AND STATUS_CODE = 'ACTIVE' ORDER BY ID DESC",
|
||||
new { Tn = truck }, ct);
|
||||
return r is null ? null : new CardInfo(r.Id, r.CurrentBalance);
|
||||
}
|
||||
|
||||
public Task<decimal?> GetLastCardLogAmountAsync(string pn, string methodName, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<decimal?>(
|
||||
"SELECT ROUND(AMOUNT, 3) FROM (SELECT AMOUNT FROM REFINERY_CARDS_LOG WHERE PN = :Pn AND METHOD_NAME = :Method ORDER BY ID DESC) WHERE ROWNUM = 1",
|
||||
new { Pn = pn, Method = methodName }, ct);
|
||||
|
||||
// CREATION_DATE has its table default (the legacy insert does not set it either)
|
||||
public Task InsertCardLogAsync(long cardId, string methodName, decimal before, decimal after, decimal amount, string userId, string pn, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_CARDS_LOG (ID, ENTITIY_ID, METHOD_NAME, BALANCE_BEFORE, BALANCE_AFTER, AMOUNT, CREATED_BY, PN)
|
||||
VALUES (SEQ_REFINERY_CARDS_LOG.NEXTVAL, :CardId, :Method, :Before, :After, :Amount, :UserId, :Pn)
|
||||
""", new { CardId = cardId, Method = methodName, Before = before, After = after, Amount = amount, UserId = userId, Pn = pn }, ct);
|
||||
|
||||
// the legacy update hit every card of the truck (also inactive ones); only the active card whose balance was logged is changed here
|
||||
public Task UpdateCardBalanceAsync(long cardId, decimal balance, string userId, long tripId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("UPDATE REFINERY_CARDS SET CURRENT_BALANCE = :Balance, UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId, LAST_TRIP_ID = :TripId WHERE ID = :CardId",
|
||||
new { Balance = balance, UserId = userId, TripId = tripId, CardId = cardId }, ct);
|
||||
|
||||
// ------------------------------------------------------------------ writes on the trip
|
||||
// FIRST_ADVANCE_PAYMENT = value valid today (end_date + 1 like CalculateRefinaryDiesel; the legacy dao used end_date and stored NULL on the last day)
|
||||
public Task MarkFirstAdvanceAsync(long id, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_TRIPS SET LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId, DIESEL_CHARGE = 1, REVERSE_PAYMENT = 0,
|
||||
FIRST_ADVANCE_PAYMENT = (SELECT TO_NUMBER(MAX(KEY_VALUE)) FROM REFINERY_VARIABLES
|
||||
WHERE KEY_NAME = 'FIRST_ADVANCE_PAYMENT' AND SYSDATE BETWEEN START_DATE AND END_DATE + 1)
|
||||
WHERE ID = :Id
|
||||
""", new { UserId = userId, Id = id }, ct);
|
||||
|
||||
public Task MarkSecondAdvanceAsync(long id, string userId, decimal secondPaymentValue, CancellationToken ct = default) =>
|
||||
ExecuteAsync("UPDATE REFINERY_TRIPS SET LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId, DIESEL_CHARGE = 2, SECOND_ADVANCE_PAYMENT = :Second, REVERSE_PAYMENT = 0 WHERE ID = :Id",
|
||||
new { UserId = userId, Second = secondPaymentValue, Id = id }, ct);
|
||||
|
||||
public Task MarkAdvanceReversedAsync(long id, string userId, int dieselCharge, CancellationToken ct = default) =>
|
||||
ExecuteAsync("UPDATE REFINERY_TRIPS SET LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId, DIESEL_CHARGE = :Charge, REVERSE_PAYMENT = 1 WHERE ID = :Id",
|
||||
new { UserId = userId, Charge = dieselCharge, Id = id }, ct);
|
||||
|
||||
public Task SaveAmountsAsync(long id, string userId, TripAmounts a, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_TRIPS SET LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId,
|
||||
TRIP_NET_WAGE = :TripNetWage, REMAINING_BALANCE = :RemainingBalance, NET_WAGE = :NetWage,
|
||||
PENALTY_AMOUNT = :PenaltyAmount, PENALTY_QUANTITY = :PenaltyQuantity, QUANTITY_WAGE = :QuantityWage,
|
||||
TOLERANCE_QUANTITY = :ToleranceQuantity, TON_WAGE = :TonWage, CALCULATED_QUANTITY_TON = :CalculatedQuantityTon,
|
||||
TON_PRICE = :TonPrice, DRIVER_TIP = :DriverTip, PERMIT_DISPATCH = :PermitDispatch, WAYBILL_FEE = :WaybillFee,
|
||||
COMMISSION = :Commission, FIRST_ADVANCE_PAYMENT = :FirstAdvancePayment, SECOND_ADVANCE_PAYMENT = :SecondAdvancePayment,
|
||||
DIESEL_LITER_PRICE = :DieselLiterPrice
|
||||
WHERE ID = :Id
|
||||
""", new
|
||||
{
|
||||
UserId = userId, Id = id, a.TripNetWage, a.RemainingBalance, a.NetWage, a.PenaltyAmount, a.PenaltyQuantity, a.QuantityWage,
|
||||
a.ToleranceQuantity, a.TonWage, a.CalculatedQuantityTon, a.TonPrice, a.DriverTip, a.PermitDispatch, a.WaybillFee,
|
||||
a.Commission, a.FirstAdvancePayment, a.SecondAdvancePayment, a.DieselLiterPrice
|
||||
}, ct);
|
||||
|
||||
public Task SetStatusReceivedAsync(long id, string userId, string status, CancellationToken ct = default) =>
|
||||
ExecuteAsync("UPDATE REFINERY_TRIPS SET STATUS_CODE = :Status, LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId, RECEIVED_BY = :UserId, RECEIVED_DATE = SYSDATE WHERE ID = :Id",
|
||||
new { Status = status, UserId = userId, Id = id }, ct);
|
||||
|
||||
public Task MarkExchangedAsync(long id, string userId, string? remarks, string? paymentOptions, bool setReceived, long? walletId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_TRIPS SET STATUS_CODE = 'EXCHANGED', LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId,
|
||||
PAYMENTED_BY = :UserId, PAYMENTED_DATE = SYSDATE,
|
||||
REMARKS = NVL(:Remarks, REMARKS),
|
||||
RECEIVED_BY = CASE WHEN :SetReceived = 1 THEN :UserId ELSE RECEIVED_BY END,
|
||||
RECEIVED_DATE = CASE WHEN :SetReceived = 1 THEN SYSDATE ELSE RECEIVED_DATE END,
|
||||
PAYMENT_OPTIONS = NVL(:PaymentOptions, PAYMENT_OPTIONS),
|
||||
REFINERY_WALLET_ID = NVL(:WalletId, REFINERY_WALLET_ID)
|
||||
WHERE ID = :Id
|
||||
""", new { UserId = userId, Remarks = remarks, SetReceived = OracleSql.ToNumber(setReceived), PaymentOptions = paymentOptions, WalletId = walletId, Id = id }, ct);
|
||||
|
||||
public async Task<decimal> BumpDinarakReferenceAsync(long id, string userId, CancellationToken ct = default)
|
||||
{
|
||||
await ExecuteAsync("UPDATE REFINERY_TRIPS SET DINARAK_REFERENCE_ID = DINARAK_REFERENCE_ID + 0.01 WHERE ID = :Id", new { Id = id }, ct);
|
||||
return await ExecuteScalarAsync<decimal>("SELECT DINARAK_REFERENCE_ID FROM REFINERY_TRIPS WHERE ID = :Id", new { Id = id }, ct);
|
||||
}
|
||||
|
||||
public Task SetVoucherSerialAsync(long id, long serial, CancellationToken ct = default) =>
|
||||
ExecuteAsync("UPDATE REFINERY_TRIPS SET VOUCHER_SERIAL_NUMBER = :Serial WHERE ID = :Id", new { Serial = serial, Id = id }, ct);
|
||||
|
||||
// dao CONFIRM_EXCHANGE (refinerytripdao.cfc:94-132); user / date fall back to the caller / now when no EXCHANGE log row exists
|
||||
public Task ConfirmExchangeAsync(long id, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_TRIPS R SET
|
||||
R.STATUS_CODE = 'EXCHANGED', R.LAST_UPDATE_DATE = SYSDATE, R.UPDATED_BY = :UserId,
|
||||
R.REFINERY_WALLET_ID = NVL((SELECT MAX(W.ID) FROM REFINERY_WALLET W
|
||||
WHERE W.STATUS_CODE = 'ACTIVE'
|
||||
AND W.TN = (SELECT TO_NUMBER(TN) FROM REFINERY_TRIPS WHERE ID = :Id)
|
||||
AND W.WALLET_NUMBER = (SELECT EWALLET_NUMBER FROM
|
||||
(SELECT D.EWALLET_NUMBER FROM REFINERY_DINARAK_API_LOG D
|
||||
WHERE D.REFINERY_TRIP_ID = :Id ORDER BY D.ID DESC) WHERE ROWNUM = 1)),
|
||||
R.REFINERY_WALLET_ID),
|
||||
R.RECEIVED_BY = NVL((SELECT USER_ID FROM (SELECT L.USER_ID FROM REFINERY_TRIPS_LOG L
|
||||
WHERE L.ENTITIY_ID = :Id AND L.METHOD_NAME = 'EXCHANGE' ORDER BY L.ID DESC) WHERE ROWNUM = 1), :UserId),
|
||||
R.PAYMENTED_BY = NVL((SELECT USER_ID FROM (SELECT L.USER_ID FROM REFINERY_TRIPS_LOG L
|
||||
WHERE L.ENTITIY_ID = :Id AND L.METHOD_NAME = 'EXCHANGE' ORDER BY L.ID DESC) WHERE ROWNUM = 1), :UserId),
|
||||
R.RECEIVED_DATE = NVL((SELECT LOG_DATE FROM (SELECT L.LOG_DATE FROM REFINERY_TRIPS_LOG L
|
||||
WHERE L.ENTITIY_ID = :Id AND L.METHOD_NAME = 'EXCHANGE' ORDER BY L.ID DESC) WHERE ROWNUM = 1), SYSDATE),
|
||||
R.PAYMENTED_DATE = NVL((SELECT LOG_DATE FROM (SELECT L.LOG_DATE FROM REFINERY_TRIPS_LOG L
|
||||
WHERE L.ENTITIY_ID = :Id AND L.METHOD_NAME = 'EXCHANGE' ORDER BY L.ID DESC) WHERE ROWNUM = 1), SYSDATE)
|
||||
WHERE R.ID = :Id
|
||||
""", new { UserId = userId, Id = id }, ct);
|
||||
|
||||
// ------------------------------------------------------------------ history (REFINERY_TRIPS_LOG)
|
||||
public Task InsertLogAsync(long tripId, string methodName, string userId, string oldJson, string newJson, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_TRIPS_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
VALUES (SEQ_REFINERY_TRIPS_LOG.NEXTVAL, :TripId, :Method, SYSDATE, :UserId, :Ip, :OldData, :NewData)
|
||||
""", new
|
||||
{
|
||||
TripId = tripId, Method = methodName, UserId = userId,
|
||||
Ip = http.HttpContext?.Connection.RemoteIpAddress?.ToString(), OldData = oldJson, NewData = newJson
|
||||
}, ct);
|
||||
|
||||
public async Task<PagedResult<TripLogRow>> SearchLogAsync(long tripId, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
const string select = """
|
||||
SELECT t.ID AS Id, t.METHOD_NAME AS MethodName, TO_CHAR(t.LOG_DATE, 'dd/mm/yyyy HH24:MI') AS LogDate, n.LOGIN AS Login,
|
||||
DBMS_LOB.SUBSTR(t.OLD_DATA, 4000, 1) AS OldData, DBMS_LOB.SUBSTR(t.NEW_DATA, 4000, 1) AS NewData
|
||||
FROM REFINERY_TRIPS_LOG t, NTP.NTPUSERS n
|
||||
WHERE t.ENTITIY_ID = :TripId AND t.USER_ID = TO_CHAR(n.ID(+))
|
||||
""";
|
||||
var p = new DynamicParameters();
|
||||
p.Add("TripId", tripId);
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(select), p, ct);
|
||||
if (total == 0) return new PagedResult<TripLogRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<TripLogRow>(OracleSql.Paginate(select + " ORDER BY t.ID DESC"), p, ct);
|
||||
return new PagedResult<TripLogRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------ reports
|
||||
private const string ReportSelect = """
|
||||
SELECT p.ID AS Id, p.PN AS Pn, p.DISPATCH_DATE AS DispatchDate, p.LOADING_NO AS LoadingNo,
|
||||
p.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthNo, p.DISCHARGE_ENTRY_DATE_DISPLAY AS DischargeEntryDate,
|
||||
p.NET_LOADING_WEIGHT AS NetLoadingWeight, p.NET_DISCHARGE_WEIGHT AS NetDischargeWeight,
|
||||
p.TN AS Tn, p.TRN AS Trn, p.NNPN AS Nnpn, ROUND(p.CURRENT_BALANCE, 3) AS CurrentBalance,
|
||||
p.DIESEL_CHARGE AS DieselCharge, p.NET_WAGE AS NetWage, p.TRIP_NET_WAGE AS TripNetWage,
|
||||
p.REMAINING_BALANCE AS RemainingBalance, p.STATUS_CODE AS StatusCode, p.WAGE_CLAIM_NO AS WageClaimNo,
|
||||
p.PAYMENTED_DATE AS PaymentedDate, p.RECEIVED_DATE AS ReceivedDate, p.RECEIVED_BY_NAME AS ReceivedByName,
|
||||
p.ACTUAL_LOADING_DATE AS ActualLoadingDate, p.PAYMENT_METHOD AS PaymentMethod, p.PAID_EPAYMENT AS PaidEpayment,
|
||||
p.PAYMENT_OPTIONS AS PaymentOptions, p.OWNER_NAME AS OwnerName, p.OWNER_NAME_ENGLISH AS OwnerNameEnglish,
|
||||
p.BANK_NAME AS BankName, p.IBAN AS Iban, p.BANK_ACCOUNT AS BankAccount, p.WALLET_NUMBER AS WalletNumber,
|
||||
p.OWNER_NNPN AS OwnerNnpn
|
||||
FROM REFINERY_TRIPS_VIEW p
|
||||
""";
|
||||
|
||||
public async Task<IReadOnlyList<TripReportRow>> ReportAsync(TripQuery query, CancellationToken ct = default)
|
||||
{
|
||||
var (where, p) = Filter(query);
|
||||
return await QueryAsync<TripReportRow>(ReportSelect + where + " ORDER BY p.ID", p, ct);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<TripReportRow>> BankReportAsync(BankReportQuery q, CancellationToken ct = default)
|
||||
{
|
||||
var (where, p) = Filter(new TripQuery(BankAccount: q.BankAccount, StatusCode: q.StatusCode, HasWageClaim: q.HasWageClaim,
|
||||
PaymentedDateFrom: q.PaymentedDateFrom, PaymentedDateTo: q.PaymentedDateTo));
|
||||
return await QueryAsync<TripReportRow>(ReportSelect + where + " ORDER BY p.ID", p, ct);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<DieselReportRow>> DieselReportAsync(DieselReportQuery q, CancellationToken ct = default)
|
||||
{
|
||||
var sql = new StringBuilder("""
|
||||
SELECT p.ID AS Id, p.PN AS Pn, p.TN AS Tn, p.STATUS_CODE AS StatusCode, p.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthNo,
|
||||
p.CREATION_DATE AS CreationDate, p.FIRSTNAME AS FirstName, p.METHOD_NAME AS MethodName,
|
||||
ROUND(p.BALANCE_BEFORE, 3) AS BalanceBefore, ROUND(p.BALANCE_AFTER, 3) AS BalanceAfter, ROUND(p.AMOUNT, 3) AS Amount
|
||||
FROM REFINERY_DIESEL_REPORT_VIEW p WHERE 1 = 1
|
||||
""");
|
||||
var p = new DynamicParameters();
|
||||
if (!string.IsNullOrWhiteSpace(q.Pn)) { sql.Append(" AND LOWER(p.PN) = LOWER(:Pn)"); p.Add("Pn", q.Pn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.Tn)) { sql.Append(" AND p.TN = :Tn"); p.Add("Tn", q.Tn.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(q.DischargeAuthNo)) { sql.Append(" AND p.DISCHARGE_AUTHORIZTION_NO = :Da"); p.Add("Da", q.DischargeAuthNo.Trim()); }
|
||||
AddIn(sql, p, "p.STATUS_CODE", "St", SplitList(q.StatusCode), numeric: false);
|
||||
AddIn(sql, p, "p.DIESEL_CHARGE", "Dc", SplitList(q.DieselCharge), numeric: true);
|
||||
if (q.DateFrom is { } f) { sql.Append(" AND p.CREATION_DATE >= :DFrom"); p.Add("DFrom", f.Date); }
|
||||
if (q.DateTo is { } t) { sql.Append(" AND p.CREATION_DATE < :DTo"); p.Add("DTo", t.Date.AddDays(1)); }
|
||||
sql.Append(" ORDER BY p.CREATION_DATE, p.ID");
|
||||
return await QueryAsync<DieselReportRow>(sql.ToString(), p, ct);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<CardRow>> CardsAsync(string? tn, CancellationToken ct = default)
|
||||
{
|
||||
const string select = "SELECT ID AS Id, TN AS Tn, CARD_NUMBER AS CardNumber, ROUND(CURRENT_BALANCE, 3) AS CurrentBalance FROM REFINERY_CARDS";
|
||||
if (tn is null) return await QueryAsync<CardRow>(select + " WHERE STATUS_CODE = 'ACTIVE' ORDER BY TN", null, ct);
|
||||
return long.TryParse(tn, out var truck)
|
||||
? await QueryAsync<CardRow>(select + " WHERE TN = :Tn ORDER BY ID", new { Tn = truck }, ct)
|
||||
: [];
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
using Microsoft.Extensions.Configuration;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Trips;
|
||||
|
||||
/// <summary>Binds configuration section "Refinery:Trips" (see <see cref="TripOptions"/>).</summary>
|
||||
internal sealed class TripSettingsService : ITripSettingsService
|
||||
{
|
||||
public TripSettingsService(IConfiguration configuration)
|
||||
{
|
||||
Value = new TripOptions();
|
||||
configuration.GetSection(TripOptions.SectionName).Bind(Value);
|
||||
}
|
||||
|
||||
public TripOptions Value { get; }
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
using System.Globalization;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Trips;
|
||||
|
||||
/// <summary>Port of common.GenerateSerialNumber('VOUCHER'): NTP.SYSTEM_VARIABLES VOUCHER_SERIAL_NO, number = {yyyy}{seq 5 digits} (e.g. 202200095).</summary>
|
||||
internal sealed class VoucherSerialRepository(INtpDbSession session, INtpUnitOfWork unitOfWork, ILogger<VoucherSerialRepository> logger)
|
||||
: NtpRepositoryBase(session, logger), IVoucherSerialRepository
|
||||
{
|
||||
public Task<long> NextAsync(CancellationToken ct = default) => unitOfWork.ExecuteInTransactionAsync(async c =>
|
||||
{
|
||||
// FOR UPDATE: two operators printing at the same time must not get the same number (the legacy code could)
|
||||
var current = await ExecuteScalarAsync<long>("SELECT TO_NUMBER(VALUE) FROM SYSTEM_VARIABLES WHERE NAME = 'VOUCHER_SERIAL_NO' FOR UPDATE", null, c);
|
||||
await ExecuteAsync("UPDATE SYSTEM_VARIABLES SET VALUE = :Value WHERE NAME = 'VOUCHER_SERIAL_NO'",
|
||||
new { Value = (current + 1).ToString(CultureInfo.InvariantCulture) }, c);
|
||||
return long.Parse(DateTime.Now.Year.ToString(CultureInfo.InvariantCulture) + current.ToString("D5", CultureInfo.InvariantCulture),
|
||||
CultureInfo.InvariantCulture);
|
||||
}, ct);
|
||||
}
|
||||
|
|
@ -1,192 +0,0 @@
|
|||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Variables;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Variables;
|
||||
|
||||
/// <summary>
|
||||
/// REFINERY_VARIABLES (key / value rows grouped by GROUP_ID) of refinery_variablesdao.cfc. The grid pivots the rows like the legacy
|
||||
/// REFINERY_VARIABLES_VIEW (docs/refinery-db-objects.txt) but also returns the ton price correction.
|
||||
/// </summary>
|
||||
internal sealed class VariablesRepository(IDbSession session, ILogger<VariablesRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), IVariablesRepository
|
||||
{
|
||||
/// <summary>KEY_VALUE is text; parse it with '.' as decimal separator whatever the session NLS is.</summary>
|
||||
private static string Num(string key) =>
|
||||
$"MAX(CASE WHEN KEY_NAME = '{key}' THEN TO_NUMBER(TRIM(KEY_VALUE), '999999999990D9999999', 'NLS_NUMERIC_CHARACTERS=''.,''') END)";
|
||||
|
||||
private static readonly string PivotSql = $"""
|
||||
SELECT GROUP_ID AS GroupId, MIN(START_DATE) AS StartDate, MIN(END_DATE) AS EndDate,
|
||||
{Num("DIESEL_LITER_PRICE")} AS DieselLiterPrice, {Num("TON_WAGE")} AS TonWage, {Num("TON_PRICE")} AS TonPrice,
|
||||
{Num("DRIVER_TIP")} AS DriverTip, {Num("PERMIT_DISPATCH")} AS PermitDispatch, {Num("WAYBILL_FEE")} AS WaybillFee,
|
||||
{Num("COMMISSION")} AS Commission, {Num("TOLERANCE_PERCENTAGE")} AS TolerancePercentage,
|
||||
{Num("FIRST_ADVANCE_PAYMENT")} AS FirstAdvancePayment, {Num("TON_PRICE_CORRECTION")} AS TonPriceCorrection,
|
||||
MAX(CASE WHEN KEY_NAME = 'TON_PRICE_CORRECTION_SET' AND TRIM(KEY_VALUE) = '1' THEN 1 ELSE 0 END) AS TonPriceCorrectionSet
|
||||
FROM REFINERY_VARIABLES
|
||||
WHERE GROUP_ID IS NOT NULL AND KEY_NAME <> 'AUTDIT_MODE'
|
||||
GROUP BY GROUP_ID
|
||||
""";
|
||||
|
||||
private sealed class SetRowDb
|
||||
{
|
||||
public long GroupId { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
public decimal? DieselLiterPrice { get; set; }
|
||||
public decimal? TonWage { get; set; }
|
||||
public decimal? TonPrice { get; set; }
|
||||
public decimal? DriverTip { get; set; }
|
||||
public decimal? PermitDispatch { get; set; }
|
||||
public decimal? WaybillFee { get; set; }
|
||||
public decimal? Commission { get; set; }
|
||||
public decimal? TolerancePercentage { get; set; }
|
||||
public decimal? FirstAdvancePayment { get; set; }
|
||||
public decimal? TonPriceCorrection { get; set; }
|
||||
public long TonPriceCorrectionSet { get; set; }
|
||||
|
||||
public VariablesSetRow ToRow() => new()
|
||||
{
|
||||
GroupId = GroupId, StartDate = StartDate, EndDate = EndDate, DieselLiterPrice = DieselLiterPrice, TonWage = TonWage,
|
||||
TonPrice = TonPrice, DriverTip = DriverTip, PermitDispatch = PermitDispatch, WaybillFee = WaybillFee,
|
||||
Commission = Commission, TolerancePercentage = TolerancePercentage, FirstAdvancePayment = FirstAdvancePayment,
|
||||
TonPriceCorrection = TonPriceCorrection, TonPriceCorrectionSet = TonPriceCorrectionSet == 1,
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<PagedResult<VariablesSetRow>> SearchAsync(VariablesQuery query, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var where = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
// legacy: both dates = periods starting inside the range, one date = exact match on that column
|
||||
if (query.StartDate is { } s && query.EndDate is { } e)
|
||||
{
|
||||
where.Append(" AND g.StartDate >= :FromDay AND g.StartDate < :ToDayExcl");
|
||||
p.Add("FromDay", s.ToDateTime(TimeOnly.MinValue));
|
||||
p.Add("ToDayExcl", e.ToDateTime(TimeOnly.MinValue).AddDays(1));
|
||||
}
|
||||
else if (query.StartDate is { } s1)
|
||||
{
|
||||
where.Append(" AND g.StartDate >= :StartDay AND g.StartDate < :StartDayExcl");
|
||||
p.Add("StartDay", s1.ToDateTime(TimeOnly.MinValue));
|
||||
p.Add("StartDayExcl", s1.ToDateTime(TimeOnly.MinValue).AddDays(1));
|
||||
}
|
||||
else if (query.EndDate is { } e1)
|
||||
{
|
||||
where.Append(" AND g.EndDate >= :EndDay AND g.EndDate < :EndDayExcl");
|
||||
p.Add("EndDay", e1.ToDateTime(TimeOnly.MinValue));
|
||||
p.Add("EndDayExcl", e1.ToDateTime(TimeOnly.MinValue).AddDays(1));
|
||||
}
|
||||
var baseSql = $"SELECT g.* FROM ({PivotSql}) g{where}";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<VariablesSetRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<SetRowDb>(OracleSql.Paginate(baseSql + " ORDER BY g.StartDate DESC, g.GroupId DESC"), p, ct);
|
||||
return new PagedResult<VariablesSetRow>(items.Select(i => i.ToRow()).ToList(), page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public async Task<VariablesSetRow?> GetAsync(long groupId, CancellationToken ct = default)
|
||||
{
|
||||
var row = await QueryFirstAsync<SetRowDb>($"SELECT g.* FROM ({PivotSql}) g WHERE g.GroupId = :GroupId ORDER BY g.StartDate", new { GroupId = groupId }, ct);
|
||||
return row?.ToRow();
|
||||
}
|
||||
|
||||
private sealed class PeriodDb
|
||||
{
|
||||
public long GroupId { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<VariablesPeriod>> GetPeriodsAsync(long? excludeGroupId, CancellationToken ct = default)
|
||||
{
|
||||
var exclude = excludeGroupId is null ? string.Empty : " AND GROUP_ID <> :ExcludeId";
|
||||
var rows = await QueryAsync<PeriodDb>($"""
|
||||
SELECT GROUP_ID AS GroupId, START_DATE AS StartDate, END_DATE AS EndDate
|
||||
FROM REFINERY_VARIABLES
|
||||
WHERE KEY_NAME <> 'AUTDIT_MODE' AND GROUP_ID IS NOT NULL AND START_DATE IS NOT NULL AND END_DATE IS NOT NULL{exclude}
|
||||
GROUP BY GROUP_ID, START_DATE, END_DATE
|
||||
""", excludeGroupId is null ? null : new { ExcludeId = excludeGroupId.Value }, ct);
|
||||
return rows.Select(r => new VariablesPeriod(r.GroupId, r.StartDate!.Value, r.EndDate!.Value)).ToList();
|
||||
}
|
||||
|
||||
public async Task<bool> HasTripsAsync(DateTime start, DateTime end, CancellationToken ct = default) =>
|
||||
await ExecuteScalarAsync<long>("""
|
||||
SELECT COUNT(*) FROM (SELECT 1 FROM REFINERY_TRIPS WHERE ACTUAL_LOADING_DATE BETWEEN :StartDate AND :EndDate AND ROWNUM = 1)
|
||||
""", new { StartDate = start, EndDate = end }, ct) > 0;
|
||||
|
||||
public async Task<TripsOfPeriodInfo> GetTripsOfPeriodAsync(DateTime start, DateTime end, CancellationToken ct = default)
|
||||
{
|
||||
// legacy reads REFINERY_TRIPS_VIEW (same STATUS_CODE / PENALTY_AMOUNT columns as the table) with to_date(ACTUAL_LOADING_DATE) between
|
||||
var row = await QueryFirstAsync<TripsOfPeriodDb>("""
|
||||
SELECT COUNT(*) AS TripCount,
|
||||
NVL(SUM(CASE WHEN STATUS_CODE IN ('READY_TO_PAY','PENDING_EXCHANGE','DISCHARGING','LOADED','RESD','ARRIVE_LOCATION') THEN 1 ELSE 0 END), 0) AS NotExchangedCount,
|
||||
NVL(SUM(CASE WHEN PENALTY_AMOUNT > 0 THEN 1 ELSE 0 END), 0) AS PenaltyTripCount
|
||||
FROM REFINERY_TRIPS
|
||||
WHERE TRUNC(ACTUAL_LOADING_DATE) BETWEEN TRUNC(:StartDate) AND TRUNC(:EndDate)
|
||||
""", new { StartDate = start, EndDate = end }, ct);
|
||||
return new TripsOfPeriodInfo { TripCount = row?.TripCount ?? 0, NotExchangedCount = row?.NotExchangedCount ?? 0, PenaltyTripCount = row?.PenaltyTripCount ?? 0 };
|
||||
}
|
||||
|
||||
private sealed class TripsOfPeriodDb
|
||||
{
|
||||
public long TripCount { get; set; }
|
||||
public long NotExchangedCount { get; set; }
|
||||
public long PenaltyTripCount { get; set; }
|
||||
}
|
||||
|
||||
public Task<long> NextGroupIdAsync(CancellationToken ct = default) =>
|
||||
ExecuteScalarAsync<long>("SELECT SEQ_REFINERY_VARIABLES_GID.NEXTVAL FROM DUAL", null, ct);
|
||||
|
||||
private Task InsertRowAsync(long groupId, string key, string value, DateTime start, DateTime end, string createdBy, CancellationToken ct) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_VARIABLES (ID, KEY_NAME, KEY_VALUE, CREATION_DATE, CREATED_BY, START_DATE, END_DATE, GROUP_ID)
|
||||
VALUES (SEQ_REFINERY_VARIABLES.NEXTVAL, :KeyName, :KeyValue, SYSDATE, :CreatedBy, :StartDate, :EndDate, :GroupId)
|
||||
""", new { KeyName = key, KeyValue = value, CreatedBy = createdBy, StartDate = start, EndDate = end, GroupId = groupId }, ct);
|
||||
|
||||
public async Task InsertSetAsync(long groupId, DateOnly start, DateOnly end, IReadOnlyDictionary<string, string> values, string createdBy, CancellationToken ct = default)
|
||||
{
|
||||
var s = start.ToDateTime(TimeOnly.MinValue);
|
||||
var e = end.ToDateTime(TimeOnly.MinValue);
|
||||
foreach (var (key, value) in values) await InsertRowAsync(groupId, key, value, s, e, createdBy, ct);
|
||||
}
|
||||
|
||||
public async Task UpdateSetAsync(long groupId, DateOnly start, DateOnly end, IReadOnlyDictionary<string, string> values, string updatedBy, CancellationToken ct = default)
|
||||
{
|
||||
var s = start.ToDateTime(TimeOnly.MinValue);
|
||||
var e = end.ToDateTime(TimeOnly.MinValue);
|
||||
foreach (var (key, value) in values)
|
||||
{
|
||||
var n = await ExecuteAsync("""
|
||||
UPDATE REFINERY_VARIABLES
|
||||
SET KEY_VALUE = :KeyValue, UPDATE_DATE = SYSDATE, UPDATED_BY = :UpdatedBy, START_DATE = :StartDate, END_DATE = :EndDate
|
||||
WHERE GROUP_ID = :GroupId AND KEY_NAME = :KeyName
|
||||
""", new { KeyValue = value, UpdatedBy = updatedBy, StartDate = s, EndDate = e, GroupId = groupId, KeyName = key }, ct);
|
||||
// legacy only updated existing rows; a key missing from the group is created so the period stays complete
|
||||
if (n == 0) await InsertRowAsync(groupId, key, value, s, e, updatedBy, ct);
|
||||
}
|
||||
// the correction rows belong to the same period: keep their dates equal (legacy left them with the old dates)
|
||||
await ExecuteAsync("""
|
||||
UPDATE REFINERY_VARIABLES SET START_DATE = :StartDate, END_DATE = :EndDate
|
||||
WHERE GROUP_ID = :GroupId AND KEY_NAME IN ('TON_PRICE_CORRECTION', 'TON_PRICE_CORRECTION_SET')
|
||||
""", new { StartDate = s, EndDate = e, GroupId = groupId }, ct);
|
||||
}
|
||||
|
||||
public async Task SetTonPriceCorrectionAsync(long groupId, string value, DateTime start, DateTime end, string userId, CancellationToken ct = default)
|
||||
{
|
||||
foreach (var (key, v) in new[] { (VariablesRules.TonPriceCorrectionKey, value), (VariablesRules.TonPriceCorrectionSetKey, "1") })
|
||||
{
|
||||
var n = await ExecuteAsync("""
|
||||
UPDATE REFINERY_VARIABLES SET KEY_VALUE = :KeyValue, UPDATE_DATE = SYSDATE, UPDATED_BY = :UpdatedBy
|
||||
WHERE GROUP_ID = :GroupId AND KEY_NAME = :KeyName
|
||||
""", new { KeyValue = v, UpdatedBy = userId, GroupId = groupId, KeyName = key }, ct);
|
||||
if (n == 0) await InsertRowAsync(groupId, key, v, start, end, userId, ct);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<RemainingBalanceRow>> GetRemainingBalancesAsync(CancellationToken ct = default) =>
|
||||
await QueryAsync<RemainingBalanceRow>(
|
||||
"SELECT ID AS Id, TN AS Tn, REMAINING_BALANCE AS RemainingBalance FROM REFINERY_REMAINING_BALANCE ORDER BY REMAINING_BALANCE DESC, ID", null, ct);
|
||||
}
|
||||
|
|
@ -1,221 +0,0 @@
|
|||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.WageClaims;
|
||||
|
||||
/// <summary>Dapper port of refinery_wage_claimdao.cfc and the SQL of refinery_wage_claimfactory.cfc (NAFITHTCS connection).</summary>
|
||||
internal sealed class WageClaimRepository(IDbSession session, ILogger<WageClaimRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), IWageClaimRepository
|
||||
{
|
||||
// REFINERY_WAGE_CLAIM_VIEW: claim + trip count + the commission claim number
|
||||
private const string ClaimSelect = """
|
||||
SELECT w.ID AS Id, w.WAGE_CLAIM_NO AS WageClaimNo, w.WAGE_CLAIM_DATE AS WageClaimDate, w.STATUS_CODE AS StatusCode,
|
||||
w.COMMISSION_CLAIM_ID AS CommissionClaimId, c.COMMISSION_CLAIM_NO AS CommissionClaimNo,
|
||||
(SELECT COUNT(*) FROM REFINERY_TRIPS t WHERE t.WAGE_CLAIM_ID = w.ID) AS TripCnt
|
||||
FROM REFINERY_WAGE_CLAIM w
|
||||
LEFT JOIN REFINERY_COMMISSION_CLAIM c ON c.ID = w.COMMISSION_CLAIM_ID
|
||||
""";
|
||||
|
||||
// columns of the trips grid inside a claim (searchClaimTrips): PN, payment date, loading no, form no / date, TN, TRN, NNPN, status
|
||||
private const string TripSelect = """
|
||||
SELECT t.ID AS Id, t.PN AS Pn, t.PAYMENTED_DATE AS PaymentedDate, t.LOADING_NO AS LoadingNo,
|
||||
t.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthoriztionNo, t.DISCHARGE_ENTRY_DATE AS DischargeEntryDate,
|
||||
t.TN AS Tn, t.TRN AS Trn, t.NNPN AS Nnpn, t.STATUS_CODE AS StatusCode
|
||||
FROM REFINERY_TRIPS t
|
||||
""";
|
||||
|
||||
public async Task<PagedResult<WageClaimRowDto>> SearchAsync(WageClaimQuery q, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var where = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
if (!string.IsNullOrWhiteSpace(q.WageClaimNo)) { where.Append(" AND TO_CHAR(w.WAGE_CLAIM_NO) = :No"); p.Add("No", q.WageClaimNo.Trim()); }
|
||||
if (q.WageClaimDate is { } d)
|
||||
{
|
||||
where.Append(" AND w.WAGE_CLAIM_DATE >= :DayFrom AND w.WAGE_CLAIM_DATE < :DayTo");
|
||||
p.Add("DayFrom", d.ToDateTime(TimeOnly.MinValue));
|
||||
p.Add("DayTo", d.AddDays(1).ToDateTime(TimeOnly.MinValue));
|
||||
}
|
||||
if (q.StatusCodes.Count > 0) where.Append(" AND w.STATUS_CODE IN (").Append(AddList(p, "St", q.StatusCodes)).Append(')');
|
||||
if (!string.IsNullOrWhiteSpace(q.CommissionClaimNo)) { where.Append(" AND TO_CHAR(c.COMMISSION_CLAIM_NO) = :CNo"); p.Add("CNo", q.CommissionClaimNo.Trim()); }
|
||||
if (q.HasCommissionClaim is { } has) where.Append(has ? " AND w.COMMISSION_CLAIM_ID IS NOT NULL" : " AND w.COMMISSION_CLAIM_ID IS NULL");
|
||||
|
||||
var baseSql = ClaimSelect + where;
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<WageClaimRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
// legacy sort: WAGE_CLAIM_NO ASC
|
||||
var items = await QueryAsync<WageClaimRowDto>(OracleSql.Paginate(baseSql + " ORDER BY w.WAGE_CLAIM_NO, w.ID"), p, ct);
|
||||
return new PagedResult<WageClaimRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public Task<WageClaimRowDto?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<WageClaimRowDto>(ClaimSelect + " WHERE w.ID = :Id", new { Id = id }, ct);
|
||||
|
||||
public async Task<PagedResult<ClaimTripRowDto>> ClaimTripsAsync(long claimId, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
p.Add("ClaimId", claimId);
|
||||
var baseSql = TripSelect + " WHERE t.WAGE_CLAIM_ID = :ClaimId";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<ClaimTripRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<ClaimTripRowDto>(OracleSql.Paginate(baseSql + " ORDER BY t.ID"), p, ct);
|
||||
return new PagedResult<ClaimTripRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// WHERE of the trips a new claim takes (legacy: status in (...), WAGE_CLAIM_ID null, PAYMENTED_DATE_STRING between FROM000000 and TO235959;
|
||||
/// that view column is DateToString(ACTUAL_LOADING_DATE), so it is the loading date).
|
||||
/// </summary>
|
||||
private static string CandidateWhere(DynamicParameters p, IReadOnlyList<string> statuses, DateOnly? from, DateOnly? to)
|
||||
{
|
||||
var w = new StringBuilder(" WHERE t.STATUS_CODE IN (").Append(AddList(p, "Ts", statuses)).Append(") AND t.WAGE_CLAIM_ID IS NULL");
|
||||
if (from is { } f) { w.Append(" AND t.ACTUAL_LOADING_DATE >= :LoadFrom"); p.Add("LoadFrom", f.ToDateTime(TimeOnly.MinValue)); }
|
||||
if (to is { } t) { w.Append(" AND t.ACTUAL_LOADING_DATE < :LoadTo"); p.Add("LoadTo", WageClaimRules.ExclusiveEnd(t)); }
|
||||
return w.ToString();
|
||||
}
|
||||
|
||||
public async Task<PagedResult<ClaimTripRowDto>> CandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly? from, DateOnly? to, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
var baseSql = TripSelect + CandidateWhere(p, statuses, from, to);
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<ClaimTripRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<ClaimTripRowDto>(OracleSql.Paginate(baseSql + " ORDER BY t.ID"), p, ct);
|
||||
return new PagedResult<ClaimTripRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public Task<int> CountCandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
return ExecuteScalarAsync<int>("SELECT COUNT(*) FROM REFINERY_TRIPS t" + CandidateWhere(p, statuses, from, to), p, ct);
|
||||
}
|
||||
|
||||
public async Task<long> InsertClaimAsync(string createdBy, CancellationToken ct = default)
|
||||
{
|
||||
// serial numbers are taken while this table is locked, so two claims created at the same time never get the same number
|
||||
await ExecuteAsync("LOCK TABLE REFINERY_WAGE_CLAIM IN SHARE ROW EXCLUSIVE MODE", null, ct);
|
||||
var id = await ExecuteScalarAsync<long>("SELECT SEQ_REFINERY_WAGE_CLAIM.NEXTVAL FROM DUAL", null, ct);
|
||||
// GenerateSerialNumber('REFINERY_WAGE_CLAIM'): yyyy + '01' + 5 digits for the first claim of the year, then max + 1
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_WAGE_CLAIM (ID, WAGE_CLAIM_NO, STATUS_CODE, CREATED_BY)
|
||||
SELECT :Id,
|
||||
NVL(MAX(t.WAGE_CLAIM_NO) + 1, TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY') || '01' || '00001')),
|
||||
'NEW', :CreatedBy
|
||||
FROM REFINERY_WAGE_CLAIM t
|
||||
WHERE TO_CHAR(t.WAGE_CLAIM_DATE, 'yyyy') = TO_CHAR(SYSDATE, 'YYYY')
|
||||
""", new { Id = id, CreatedBy = createdBy }, ct);
|
||||
return id;
|
||||
}
|
||||
|
||||
public Task<int> AttachTripsAsync(long claimId, IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default)
|
||||
{
|
||||
var p = new DynamicParameters();
|
||||
p.Add("ClaimId", claimId);
|
||||
return ExecuteAsync("UPDATE REFINERY_TRIPS t SET t.WAGE_CLAIM_ID = :ClaimId" + CandidateWhere(p, statuses, from, to), p, ct);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<string>> ClaimTripStatusesAsync(long claimId, CancellationToken ct = default) =>
|
||||
await QueryAsync<string>("SELECT DISTINCT STATUS_CODE FROM REFINERY_TRIPS WHERE WAGE_CLAIM_ID = :ClaimId", new { ClaimId = claimId }, ct);
|
||||
|
||||
public async Task<int> CompleteClaimTripsAsync(long claimId, string userLogin, long userId, string? ip, CancellationToken ct = default)
|
||||
{
|
||||
// logs.saveLog(session, 'REFINERYTRIP', 'TRIP_COMPLETE', ...): old/new status captions, ids from SEQ_REFINERY_TRIPS_LOG
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_TRIPS_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
SELECT SEQ_REFINERY_TRIPS_LOG.NEXTVAL, t.ID, 'TRIP_COMPLETE', SYSDATE, :UserId, :Ip, :OldData, :NewData
|
||||
FROM REFINERY_TRIPS t WHERE t.WAGE_CLAIM_ID = :ClaimId
|
||||
""", new
|
||||
{
|
||||
UserId = userId.ToString(System.Globalization.CultureInfo.InvariantCulture), Ip = Cut(ip, 50), ClaimId = claimId,
|
||||
OldData = ClaimLogJson.Status(ClaimMessages.TripExchanged), NewData = ClaimLogJson.Status(ClaimMessages.TripComplete),
|
||||
}, ct);
|
||||
return await ExecuteAsync("""
|
||||
UPDATE REFINERY_TRIPS SET STATUS_CODE = 'COMPLETE', LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserLogin
|
||||
WHERE WAGE_CLAIM_ID = :ClaimId
|
||||
""", new { UserLogin = userLogin, ClaimId = claimId }, ct);
|
||||
}
|
||||
|
||||
public Task SetClaimStatusAsync(long claimId, string status, string userLogin, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_WAGE_CLAIM SET STATUS_CODE = :Status, LAST_UPDATE_DATE = SYSDATE, UPDATED_BY = :UserLogin WHERE ID = :Id
|
||||
""", new { Status = status, UserLogin = userLogin, Id = claimId }, ct);
|
||||
|
||||
public async Task<IReadOnlyList<TransferTripRow>> TripsToTransferAsync(long claimId, CancellationToken ct = default) =>
|
||||
await QueryAsync<TransferTripRow>("""
|
||||
SELECT ID AS Id, PN AS Pn, STATUS_CODE AS StatusCode FROM REFINERY_TRIPS
|
||||
WHERE WAGE_CLAIM_ID = :ClaimId AND TRIP_STATUS = '6' ORDER BY ID
|
||||
""", new { ClaimId = claimId }, ct);
|
||||
|
||||
public async Task MarkTripTransferredAsync(TransferTripRow trip, long userId, string? ip, CancellationToken ct = default)
|
||||
{
|
||||
await ExecuteAsync("UPDATE REFINERY_TRIPS SET TRIP_STATUS = '7' WHERE ID = :Id", new { trip.Id }, ct);
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_TRIPS_LOG (ID, ENTITIY_ID, METHOD_NAME, STATUS_CODE, OLD_DATA, NEW_DATA, TRIP_STATUS, USER_ID, USER_IP)
|
||||
VALUES (SEQ_REFINERY_TRIPS_LOG.NEXTVAL, :Id, 'TRANSFER_TO_REFINERY', :StatusCode, NULL, NULL, '7', :UserId, :Ip)
|
||||
""", new { trip.Id, trip.StatusCode, UserId = userId.ToString(System.Globalization.CultureInfo.InvariantCulture), Ip = Cut(ip, 50) }, ct);
|
||||
}
|
||||
|
||||
public Task AddLogAsync(long claimId, string method, string? oldData, string? newData, long userId, string? ip, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_WAGE_CLAIM_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
VALUES (SEQ_LOG_REFINERY_WAGE_CLAIM.NEXTVAL, :ClaimId, :Method, SYSDATE, :UserId, :Ip, :OldData, :NewData)
|
||||
""", new
|
||||
{
|
||||
ClaimId = claimId, Method = method, UserId = userId.ToString(System.Globalization.CultureInfo.InvariantCulture), Ip = Cut(ip, 50),
|
||||
OldData = oldData, NewData = newData,
|
||||
}, ct);
|
||||
|
||||
public async Task<PagedResult<ClaimLogRowDto>> LogAsync(long claimId, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
// REFINERY_WAGE_CLAIM_LOG_VIEW: log rows newest first, with the login of the user (USER_ID holds NTPUSERS.ID as text)
|
||||
var p = new DynamicParameters();
|
||||
p.Add("ClaimId", claimId);
|
||||
const string from = " FROM REFINERY_WAGE_CLAIM_LOG t WHERE t.ENTITIY_ID = :ClaimId";
|
||||
var total = await ExecuteScalarAsync<long>("SELECT COUNT(*)" + from, p, ct);
|
||||
if (total == 0) return new PagedResult<ClaimLogRowDto>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<ClaimLogRowDto>(OracleSql.Paginate("""
|
||||
SELECT t.ID AS Id, t.METHOD_NAME AS MethodName, t.LOG_DATE AS LogDate,
|
||||
(SELECT MIN(n.LOGIN) FROM NTP.NTPUSERS n WHERE TO_CHAR(n.ID) = t.USER_ID) AS Login,
|
||||
DBMS_LOB.SUBSTR(t.OLD_DATA, 4000, 1) AS OldData, DBMS_LOB.SUBSTR(t.NEW_DATA, 4000, 1) AS NewData
|
||||
FROM REFINERY_WAGE_CLAIM_LOG t WHERE t.ENTITIY_ID = :ClaimId ORDER BY t.ID DESC
|
||||
"""), p, ct);
|
||||
return new PagedResult<ClaimLogRowDto>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<WageClaimReportRaw>> ReportRowsAsync(long claimId, CancellationToken ct = default) =>
|
||||
// REFINERY_CLAIMS_REPORT_VIEW (trips of the claim, ordered by ID); the driver name comes from the COMPLETED DRIVERS_INFO row
|
||||
await QueryAsync<WageClaimReportRaw>("""
|
||||
SELECT t.ID AS Id,
|
||||
(SELECT MIN(i.NAME_AR) FROM DRIVERS_INFO i WHERE i.NNPN = t.NNPN AND i.STATUS_CODE = 'COMPLETED') AS Drvr,
|
||||
t.TN AS Tn, t.DISCHARGE_AUTHORIZTION_NO AS DischargeAuthoriztionNo, t.DISCHARGE_AUTHORIZTION_YEAR AS DischargeAuthoriztionYear,
|
||||
t.DISCHARGE_ENTRY_DATE AS DischargeEntryDate, t.CLIENT_NO AS ClientNo, t.LOADING_NO AS LoadingNo,
|
||||
t.ACTUAL_LOADING_DATE AS ActualLoadingDate, t.NET_LOADING_WEIGHT AS NetLoadingWeight, t.WATER_AMOUNT AS WaterAmount,
|
||||
t.NET_DISCHARGE_WEIGHT AS NetDischargeWeight, t.CALCULATED_QUANTITY_TON AS CalculatedQuantityTon,
|
||||
t.TOLERANCE_QUANTITY AS ToleranceQuantity, t.PENALTY_QUANTITY AS PenaltyQuantity, t.TON_PRICE AS TonPrice,
|
||||
t.PENALTY_AMOUNT AS PenaltyAmount, t.DRIVER_TIP AS DriverTip, t.PERMIT_DISPATCH AS PermitDispatch, t.WAYBILL_FEE AS WaybillFee,
|
||||
t.DIESEL_LITER_PRICE AS DieselLiterPrice,
|
||||
(SELECT SUM(l.AMOUNT) FROM REFINERY_CARDS_LOG l WHERE l.PN = t.PN) AS AdvancePaymentForDiesel,
|
||||
t.COMMISSION AS Commission, t.NET_WAGE AS NetWage
|
||||
FROM REFINERY_TRIPS t WHERE t.WAGE_CLAIM_ID = :ClaimId ORDER BY t.ID
|
||||
""", new { ClaimId = claimId }, ct);
|
||||
|
||||
/// <summary>Adds the values as :{prefix}0, :{prefix}1 ... and returns the comma separated placeholder list.</summary>
|
||||
private static string AddList(DynamicParameters p, string prefix, IEnumerable<string> values)
|
||||
{
|
||||
var names = new List<string>();
|
||||
foreach (var v in values) { var n = prefix + names.Count; p.Add(n, v); names.Add(":" + n); }
|
||||
return string.Join(", ", names);
|
||||
}
|
||||
|
||||
private static string? Cut(string? s, int max) => s is null ? null : s.Length <= max ? s : s[..max];
|
||||
}
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
using System.Data;
|
||||
using System.Text;
|
||||
using Dapper;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Wallets;
|
||||
|
||||
namespace NTP.Infrastructure.Persistence.Repositories.Refinery.Wallets;
|
||||
|
||||
/// <summary>
|
||||
/// REFINERY_WALLET / REFINERY_WALLET_LOG of refinery_walletdao.cfc. The SELECT mirrors the legacy REFINERY_WALLET_VIEW (docs/refinery-db-objects.txt)
|
||||
/// on the table, and also returns the stored (not fallback) owner columns that the update log compares.
|
||||
/// </summary>
|
||||
internal sealed class WalletsRepository(IDbSession session, ILogger<WalletsRepository> logger)
|
||||
: OracleRepositoryBase(session, logger), IWalletsRepository
|
||||
{
|
||||
private const string Columns = """
|
||||
w.ID AS Id, w.TN AS Tn, w.COMPANY_CODE AS CompanyCode, w.EPAYMENT AS Epayment,
|
||||
w.OWNER_NNPN AS OwnerNnpn, w.WALLET_NUMBER AS WalletNumber, w.OWNER_NAME AS OwnerName,
|
||||
NVL(w.OWNER_NNPN, w.DRIVER_NNPN) AS HolderNnpn, NVL(w.OWNER_NAME, w.DRIVER_NAME) AS HolderName,
|
||||
w.OWNER_NAME_ENGLISH AS OwnerNameEnglish, w.DRIVER_NAME AS DriverName, w.DRIVER_NNPN AS DriverNnpn,
|
||||
w.IBAN AS Iban, w.BANK_ACCOUNT AS BankAccount, w.BANK_NAME AS BankName, w.BANK_BRANCH AS BankBranch,
|
||||
w.CREATION_DATE AS CreationDate, w.CREATED_BY AS CreatedBy, w.UPDATE_DATE AS UpdateDate, w.UPDATED_BY AS UpdatedBy,
|
||||
w.STATUS_CODE AS StatusCode,
|
||||
CASE WHEN w.DRIVER_NNPN IS NOT NULL THEN 'DRAIVER_WALLET' WHEN w.EPAYMENT = 0 THEN 'BANK' ELSE 'EWALLET' END AS PaymentMethod
|
||||
""";
|
||||
|
||||
public async Task<PagedResult<WalletRow>> SearchAsync(WalletsQuery query, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
var where = new StringBuilder(" WHERE 1 = 1");
|
||||
var p = new DynamicParameters();
|
||||
// legacy getGridData: exact, case-insensitive match; OWNER_NAME is a contains match ('%text%')
|
||||
if (!string.IsNullOrWhiteSpace(query.Tn))
|
||||
{
|
||||
if (long.TryParse(query.Tn.Trim(), out var tn)) { where.Append(" AND w.TN = :Tn"); p.Add("Tn", tn); }
|
||||
else where.Append(" AND 1 = 0");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(query.Nnpn))
|
||||
{
|
||||
if (long.TryParse(query.Nnpn.Trim(), out var nnpn)) { where.Append(" AND NVL(w.OWNER_NNPN, w.DRIVER_NNPN) = :Nnpn"); p.Add("Nnpn", nnpn); }
|
||||
else where.Append(" AND 1 = 0");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(query.WalletNumber)) { where.Append(" AND LOWER(w.WALLET_NUMBER) = LOWER(:WalletNumber)"); p.Add("WalletNumber", query.WalletNumber.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(query.BankAccount)) { where.Append(" AND LOWER(w.BANK_ACCOUNT) = LOWER(:BankAccount)"); p.Add("BankAccount", query.BankAccount.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(query.OwnerName))
|
||||
{
|
||||
where.Append(" AND LOWER(NVL(w.OWNER_NAME, w.DRIVER_NAME)) LIKE LOWER(:OwnerName) ESCAPE '\\'");
|
||||
p.Add("OwnerName", "%" + OracleSql.EscapeLike(query.OwnerName.Trim()) + "%");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(query.StatusCode)) { where.Append(" AND w.STATUS_CODE = :Status"); p.Add("Status", query.StatusCode.Trim()); }
|
||||
if (!string.IsNullOrWhiteSpace(query.PaymentMethod))
|
||||
{
|
||||
where.Append(" AND (CASE WHEN w.DRIVER_NNPN IS NOT NULL THEN 'DRAIVER_WALLET' WHEN w.EPAYMENT = 0 THEN 'BANK' ELSE 'EWALLET' END) = :Kind");
|
||||
p.Add("Kind", query.PaymentMethod.Trim());
|
||||
}
|
||||
var baseSql = $"SELECT {Columns} FROM REFINERY_WALLET w{where}";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), p, ct);
|
||||
if (total == 0) return new PagedResult<WalletRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
p.Add("MinRow", page.MinRow);
|
||||
p.Add("MaxRow", page.MaxRow);
|
||||
var items = await QueryAsync<WalletRow>(OracleSql.Paginate(baseSql + " ORDER BY w.ID"), p, ct);
|
||||
return new PagedResult<WalletRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
public Task<WalletRow?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
QueryFirstAsync<WalletRow>($"SELECT {Columns} FROM REFINERY_WALLET w WHERE w.ID = :Id", new { Id = id }, ct);
|
||||
|
||||
public Task<IReadOnlyList<long>> GetActiveIdsByTruckAsync(long tn, CancellationToken ct = default) =>
|
||||
QueryAsync<long>("SELECT ID FROM REFINERY_WALLET WHERE TN = :Tn AND STATUS_CODE = 'ACTIVE' ORDER BY ID", new { Tn = tn }, ct);
|
||||
|
||||
public Task<IReadOnlyList<long>> GetActiveIdsByDriverAsync(long nnpn, CancellationToken ct = default) =>
|
||||
QueryAsync<long>("SELECT ID FROM REFINERY_WALLET WHERE DRIVER_NNPN = :Nnpn AND STATUS_CODE = 'ACTIVE' ORDER BY ID", new { Nnpn = nnpn }, ct);
|
||||
|
||||
public async Task<long> InsertAsync(WalletWrite w, string createdBy, CancellationToken ct = default)
|
||||
{
|
||||
// STATUS_CODE (ACTIVE) and CREATION_DATE come from the column defaults; IBAN, BANK_ACCOUNT and BANK_NAME default to '-' when not given
|
||||
// (legacy omitted empty values from the INSERT). CREATED_BY is VARCHAR2(10) (the numeric user id).
|
||||
var p = new DynamicParameters(new
|
||||
{
|
||||
w.Tn, w.Epayment, w.OwnerNnpn, w.WalletNumber, w.OwnerName, w.DriverName, w.DriverNnpn, w.Iban, w.BankAccount, w.BankName,
|
||||
w.BankBranch, w.OwnerNameEnglish, CreatedBy = Fit(createdBy, 10),
|
||||
});
|
||||
p.Add("NewId", dbType: DbType.Int64, direction: ParameterDirection.Output);
|
||||
await ExecuteAsync("""
|
||||
INSERT INTO REFINERY_WALLET
|
||||
(ID, TN, EPAYMENT, OWNER_NNPN, WALLET_NUMBER, OWNER_NAME, DRIVER_NAME, DRIVER_NNPN, IBAN, BANK_ACCOUNT, BANK_NAME,
|
||||
BANK_BRANCH, OWNER_NAME_ENGLISH, CREATED_BY)
|
||||
VALUES
|
||||
(SEQ_REFINERY_WALLET.NEXTVAL, :Tn, :Epayment, :OwnerNnpn, :WalletNumber, :OwnerName, :DriverName, :DriverNnpn,
|
||||
NVL(:Iban, '-'), NVL(:BankAccount, '-'), NVL(:BankName, '-'), :BankBranch, :OwnerNameEnglish, :CreatedBy)
|
||||
RETURNING ID INTO :NewId
|
||||
""", p, ct);
|
||||
return OracleSql.ToInt64(p.Get<object>("NewId"));
|
||||
}
|
||||
|
||||
public Task SetStatusAsync(long id, string status, string userId, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
UPDATE REFINERY_WALLET SET STATUS_CODE = :Status, UPDATE_DATE = SYSDATE, UPDATED_BY = :UserId WHERE ID = :Id
|
||||
""", new { Status = status, UserId = Fit(userId, 10), Id = id }, ct);
|
||||
|
||||
public Task InsertLogAsync(long entityId, string method, string userId, string? userIp, string oldData, string newData, CancellationToken ct = default) =>
|
||||
ExecuteAsync("""
|
||||
INSERT INTO REFINERY_WALLET_LOG (ID, ENTITIY_ID, METHOD_NAME, LOG_DATE, USER_ID, USER_IP, OLD_DATA, NEW_DATA)
|
||||
VALUES (SEQ_LOG_REFINERY_WALLET.NEXTVAL, :EntityId, :Method, SYSDATE, :UserId, :UserIp, :OldData, :NewData)
|
||||
""", new { EntityId = entityId, Method = method, UserId = Fit(userId, 50), UserIp = userIp is null ? null : Fit(userIp, 50), OldData = oldData, NewData = newData }, ct);
|
||||
|
||||
public async Task<PagedResult<WalletLogRow>> GetLogAsync(long entityId, PageRequest page, CancellationToken ct = default)
|
||||
{
|
||||
// legacy REFINERY_WALLET_LOG_VIEW: log joined to NTP.NTPUSERS for the login (USER_ID holds the numeric user id)
|
||||
const string baseSql = """
|
||||
SELECT t.ID AS Id, t.ENTITIY_ID AS EntityId, t.METHOD_NAME AS MethodName, n.LOGIN AS Login, t.LOG_DATE AS LogDate,
|
||||
t.USER_ID AS UserId, t.USER_IP AS UserIp,
|
||||
DBMS_LOB.SUBSTR(t.OLD_DATA, 4000, 1) AS OldData, DBMS_LOB.SUBSTR(t.NEW_DATA, 4000, 1) AS NewData
|
||||
FROM REFINERY_WALLET_LOG t LEFT JOIN NTP.NTPUSERS n ON n.ID = t.USER_ID
|
||||
WHERE t.ENTITIY_ID = :EntityId
|
||||
""";
|
||||
var total = await ExecuteScalarAsync<long>(OracleSql.Count(baseSql), new { EntityId = entityId }, ct);
|
||||
if (total == 0) return new PagedResult<WalletLogRow>([], page.SafePage, page.SafePageSize, 0);
|
||||
var items = await QueryAsync<WalletLogRow>(OracleSql.Paginate(baseSql + " ORDER BY t.ID DESC"),
|
||||
new { EntityId = entityId, page.MinRow, page.MaxRow }, ct);
|
||||
return new PagedResult<WalletLogRow>(items, page.SafePage, page.SafePageSize, total);
|
||||
}
|
||||
|
||||
private static string Fit(string value, int max) => value.Length <= max ? value : value[..max];
|
||||
}
|
||||
|
|
@ -114,8 +114,8 @@ public class BillingCalculatorTests
|
|||
|
||||
[Theory]
|
||||
[InlineData(0, true)]
|
||||
[InlineData(60000, true)]
|
||||
[InlineData(60001, false)]
|
||||
[InlineData(50000, true)]
|
||||
[InlineData(50001, false)]
|
||||
[InlineData(-1, false)]
|
||||
public void Sent_weight_range(int w, bool ok) => Assert.Equal(ok, BillingCalculator.IsSentWeightInRange(w));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
using NTP.Application.Refinery.Cards;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class CardsRulesTests
|
||||
{
|
||||
[Theory]
|
||||
[InlineData("INACTIVE", true)]
|
||||
[InlineData("inactive", true)]
|
||||
[InlineData("ACTIVE", false)]
|
||||
[InlineData(null, false)]
|
||||
public void Only_an_inactive_card_can_be_activated(string? status, bool expected) => Assert.Equal(expected, CardsRules.CanActivate(status));
|
||||
|
||||
[Theory]
|
||||
[InlineData("ACTIVE", true)]
|
||||
[InlineData("INACTIVE", false)]
|
||||
[InlineData("", false)]
|
||||
public void Only_an_active_card_can_be_deactivated(string status, bool expected) => Assert.Equal(expected, CardsRules.CanDeactivate(status));
|
||||
|
||||
[Fact]
|
||||
public void A_truck_without_previous_cards_may_start_with_any_balance() => Assert.True(CardsRules.BalanceMatchesPrevious(null, 250));
|
||||
|
||||
[Fact]
|
||||
public void A_new_card_keeps_the_balance_of_the_previous_one()
|
||||
{
|
||||
Assert.True(CardsRules.BalanceMatchesPrevious(13174m, 13174m));
|
||||
Assert.False(CardsRules.BalanceMatchesPrevious(13174m, 0m));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Create_form_checks()
|
||||
{
|
||||
var v = new CreateCardValidator();
|
||||
Assert.True(v.Validate(new CreateCardRequest { Tn = 6066854, CardNumber = "52317", CurrentBalance = 100 }).IsValid);
|
||||
Assert.False(v.Validate(new CreateCardRequest { Tn = 0, CardNumber = "52317", CurrentBalance = 100 }).IsValid);
|
||||
Assert.False(v.Validate(new CreateCardRequest { Tn = 1, CardNumber = "", CurrentBalance = 100 }).IsValid);
|
||||
Assert.False(v.Validate(new CreateCardRequest { Tn = 1, CardNumber = "12345678901", CurrentBalance = 100 }).IsValid); // VARCHAR2(10)
|
||||
Assert.False(v.Validate(new CreateCardRequest { Tn = 1, CardNumber = "1", CurrentBalance = -1 }).IsValid);
|
||||
Assert.False(v.Validate(new CreateCardRequest { Tn = 1, CardNumber = "1", CurrentBalance = 10_000_000 }).IsValid); // log column NUMBER(10,3)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.CommissionClaims;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class CommissionClaimRulesTests
|
||||
{
|
||||
[Fact]
|
||||
public void Billing_period_is_the_month_before_the_newest_wage_claim()
|
||||
{
|
||||
var (s, e) = CommissionClaimRules.BillingPeriod(new DateTime(2023, 8, 27, 16, 42, 0));
|
||||
Assert.Equal(new DateOnly(2023, 7, 1), s);
|
||||
Assert.Equal(new DateOnly(2023, 7, 31), e);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Billing_period_of_january_is_december_of_the_year_before()
|
||||
{
|
||||
var (s, e) = CommissionClaimRules.BillingPeriod(new DateTime(2024, 1, 5));
|
||||
Assert.Equal(new DateOnly(2023, 12, 1), s);
|
||||
Assert.Equal(new DateOnly(2023, 12, 31), e);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Billing_period_handles_a_leap_february()
|
||||
{
|
||||
var (_, e) = CommissionClaimRules.BillingPeriod(new DateTime(2024, 3, 2));
|
||||
Assert.Equal(new DateOnly(2024, 2, 29), e);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Invoice_lines_total_with_tax_and_round_the_net_to_three_decimals()
|
||||
{
|
||||
var l = CommissionClaimRules.Line("x", 100, 2.00m);
|
||||
Assert.Equal(200m, l.TotalWithTax);
|
||||
Assert.Equal(172.414m, l.TotalBeforeTax); // ROUND(200 / 1.16, 3)
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Invoice_totals_follow_the_legacy_template()
|
||||
{
|
||||
var inv = CommissionClaimRules.BuildInvoice(20230200009, new DateTime(2023, 8, 31), 100, 3.5m);
|
||||
Assert.Equal("INV 20230200009", inv.InvoiceNumber);
|
||||
Assert.Equal(new DateOnly(2023, 7, 31), inv.InvoiceDate);
|
||||
Assert.Equal(["العمولة الثابتة", "العمولة التنافسية"], inv.Lines.Select(l => l.Label));
|
||||
Assert.Equal([100L, 100L], inv.Lines.Select(l => l.Quantity));
|
||||
Assert.Equal(172.414m + 301.724m, inv.TotalBeforeTax);
|
||||
Assert.Equal(550m, inv.GrandTotal);
|
||||
Assert.Equal(550m - (172.414m + 301.724m), inv.Tax);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Wage_claim_selection_is_required()
|
||||
{
|
||||
var ex = Assert.Throws<BusinessException>(() => CommissionClaimRules.NormalizeIds(null));
|
||||
Assert.Equal("يرجى اختيار المطالبة", ex.Message);
|
||||
Assert.Throws<BusinessException>(() => CommissionClaimRules.NormalizeIds([0, -1]));
|
||||
Assert.Equal([3L, 5L], CommissionClaimRules.NormalizeIds([3, 5, 3, 0]));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Commission_claim_completes_only_when_every_wage_claim_is_paid()
|
||||
{
|
||||
Assert.True(CommissionClaimRules.AllWageClaimsPaid(["CLOSE", "CLOSE"]));
|
||||
Assert.True(CommissionClaimRules.AllWageClaimsPaid([]));
|
||||
Assert.False(CommissionClaimRules.AllWageClaimsPaid(["CLOSE", "NEW"]));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
using NTP.Infrastructure.Integrations;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class DinarakProtocolTests
|
||||
{
|
||||
[Fact]
|
||||
public void Transfer_request_keeps_the_legacy_property_order_and_values()
|
||||
{
|
||||
var json = DinarakProtocol.BuildTransferRequest("محمد احمد", 271.975m, "26968", 352.1m, "795000000", DinarakProtocol.TransferOperation);
|
||||
|
||||
Assert.Equal(
|
||||
"{\"Name\":\"محمد احمد\",\"Amount\":271.975,\"Description\":\" 26968\",\"MessageId\":\"352.1\",\"Reference\":\"352.1\"," +
|
||||
"\"ReceiverID\":\"795000000\",\"OperationName\":\"Transfer\",\"Conditions\":[{\"NationalId\":\"\"}]}", json);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Token_request_for_the_log_never_carries_the_password()
|
||||
{
|
||||
var real = DinarakProtocol.BuildTokenRequest("user", "s3cret");
|
||||
var logged = DinarakProtocol.BuildTokenRequestForLog("user");
|
||||
|
||||
Assert.Equal("{\"username\":\"user\",\"password\":\"s3cret\",\"grant_type\":\"password\"}", real);
|
||||
Assert.DoesNotContain("s3cret", logged);
|
||||
Assert.Contains("\"username\":\"user\"", logged);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("ZAINJOPX", "Transfer")]
|
||||
[InlineData("ORNGJOPX", "Transfer")]
|
||||
[InlineData("dnrkjopx", "Transfer")]
|
||||
[InlineData("MDFTJOPX", "Transfer")]
|
||||
[InlineData("BANKJOPX", "bank salary internal")]
|
||||
[InlineData(null, "bank salary internal")]
|
||||
public void Wallet_type_decides_the_operation(string? picCode, string expected) =>
|
||||
Assert.Equal(expected, DinarakProtocol.OperationFor(picCode));
|
||||
|
||||
[Fact]
|
||||
public void Pic_code_is_read_from_the_alias_answer_and_garbage_gives_null()
|
||||
{
|
||||
Assert.Equal("ZAINJOPX", DinarakProtocol.ParsePicCode("{\"picCode\":\"ZAINJOPX\",\"name\":\"x\"}"));
|
||||
Assert.Null(DinarakProtocol.ParsePicCode("{\"other\":1}"));
|
||||
Assert.Null(DinarakProtocol.ParsePicCode("<html>"));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(271.975, 271.975, true)]
|
||||
[InlineData(271.975, 271.976, true)]
|
||||
[InlineData(271.975, 271.977, false)] // 0.002 > 0.001
|
||||
[InlineData(10, 11, false)]
|
||||
public void Amount_check_allows_a_thousandth(double calculated, double requested, bool ok) =>
|
||||
Assert.Equal(ok, DinarakProtocol.AmountMatches((decimal)calculated, (decimal)requested));
|
||||
|
||||
[Fact]
|
||||
public void Message_ids_are_plain_decimals()
|
||||
{
|
||||
Assert.Equal("352.1", DinarakProtocol.FormatMessageId(352.1m));
|
||||
Assert.Equal("352.11", DinarakProtocol.FormatMessageId(352.11m));
|
||||
Assert.Equal("78388", DinarakProtocol.FormatMessageId(78388m));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Transfer_answers_map_to_the_legacy_codes()
|
||||
{
|
||||
Assert.Equal(("000", "SUCCESS"), Pair(DinarakProtocol.MapTransferResponse(200, "{\"status\":{\"name\":\"Success\"}}")));
|
||||
Assert.True(DinarakProtocol.MapTransferResponse(200, "{\"status\":{\"name\":\"Success\"}}").Success);
|
||||
|
||||
var refused = DinarakProtocol.MapTransferResponse(200, "{\"status\":{\"name\":\"Failed\",\"errorMessage\":\"Insufficient funds here\"}}");
|
||||
Assert.Equal(("102", "Insufficient_funds_here"), Pair(refused));
|
||||
|
||||
Assert.Equal(("103", "Bad_gateway"), Pair(DinarakProtocol.MapTransferResponse(502, "Bad gateway")));
|
||||
Assert.Equal("104", DinarakProtocol.MapTransferResponse(200, "not json").Code);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("Success", true)]
|
||||
[InlineData("Processing", true)]
|
||||
[InlineData("New", true)]
|
||||
[InlineData("Failed", false)]
|
||||
public void Status_lookup_accepts_success_processing_and_new(string name, bool accepted)
|
||||
{
|
||||
var s = DinarakProtocol.MapStatusResponse(200, "{\"status\":{\"name\":\"" + name + "\"}}");
|
||||
Assert.Equal(accepted, s.Accepted);
|
||||
Assert.Equal(name, s.StatusName);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Status_lookup_with_an_http_error_is_not_accepted()
|
||||
{
|
||||
var s = DinarakProtocol.MapStatusResponse(404, "nothing");
|
||||
Assert.False(s.Accepted);
|
||||
Assert.Equal("HTTP_404", s.StatusName);
|
||||
Assert.Equal("ERROR", DinarakProtocol.MapStatusResponse(200, "<html>").StatusName);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Bearer_header_value_is_built_from_the_access_token()
|
||||
{
|
||||
Assert.Equal("bearer abc", DinarakProtocol.ParseBearer("{\"access_token\":\"abc\",\"expires_in\":1}"));
|
||||
Assert.Null(DinarakProtocol.ParseBearer("{\"access_token\":\"\"}"));
|
||||
Assert.Null(DinarakProtocol.ParseBearer("nope"));
|
||||
}
|
||||
|
||||
private static (string, string) Pair(NTP.Application.Refinery.Integrations.DinarakTransferResult r) => (r.Code, r.Message);
|
||||
}
|
||||
|
||||
public class DinarakClientTests
|
||||
{
|
||||
private sealed class Recorder(Func<HttpRequestMessage, HttpResponseMessage> answer) : HttpMessageHandler
|
||||
{
|
||||
public List<(HttpMethod Method, string Url, string? Body, Dictionary<string, string> Headers)> Calls { get; } = [];
|
||||
|
||||
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
|
||||
{
|
||||
var body = request.Content is null ? null : await request.Content.ReadAsStringAsync(cancellationToken);
|
||||
var headers = request.Headers.ToDictionary(h => h.Key, h => string.Join(",", h.Value), StringComparer.OrdinalIgnoreCase);
|
||||
if (request.Content is not null) headers["Content-Type"] = request.Content.Headers.ContentType!.ToString();
|
||||
Calls.Add((request.Method, request.RequestUri!.ToString(), body, headers));
|
||||
return answer(request);
|
||||
}
|
||||
}
|
||||
|
||||
private static HttpResponseMessage Json(string body, HttpStatusCode code = HttpStatusCode.OK) =>
|
||||
new(code) { Content = new StringContent(body, Encoding.UTF8, "application/json") };
|
||||
|
||||
private static DinarakClient Client(Recorder handler) =>
|
||||
new(new HttpClient(handler), new DinarakOptions { BaseUrl = "https://dinarak.invalid/api/", UserName = "u", Password = "p" });
|
||||
|
||||
[Fact]
|
||||
public async Task Token_call_posts_the_login_json_to_token_with_arabic_accept_language()
|
||||
{
|
||||
var h = new Recorder(_ => Json("{\"access_token\":\"tok\"}"));
|
||||
var r = await Client(h).GetTokenAsync();
|
||||
|
||||
Assert.Equal(200, r.Status);
|
||||
var call = Assert.Single(h.Calls);
|
||||
Assert.Equal(HttpMethod.Post, call.Method);
|
||||
Assert.Equal("https://dinarak.invalid/api/token", call.Url);
|
||||
Assert.Equal("{\"username\":\"u\",\"password\":\"p\",\"grant_type\":\"password\"}", call.Body);
|
||||
Assert.Equal("ar", call.Headers["Accept-Language"]);
|
||||
Assert.StartsWith("application/json", call.Headers["Content-Type"]);
|
||||
Assert.False(call.Headers.ContainsKey("Authorization"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Alias_resolve_and_status_lookup_use_get_with_the_bearer_token()
|
||||
{
|
||||
var h = new Recorder(_ => Json("{}"));
|
||||
var c = Client(h);
|
||||
await c.AliasResolveAsync("bearer tok", "795000000");
|
||||
await c.GetByMessageIdAsync("bearer tok", "352.1");
|
||||
|
||||
Assert.Equal("https://dinarak.invalid/api/Transfer/AliasResolve?aliastype=MOBL&value=795000000", h.Calls[0].Url);
|
||||
Assert.Equal("https://dinarak.invalid/api/transfer/transferByMessageID?MessageID=352.1", h.Calls[1].Url);
|
||||
Assert.All(h.Calls, x =>
|
||||
{
|
||||
Assert.Equal(HttpMethod.Get, x.Method);
|
||||
Assert.Equal("bearer tok", x.Headers["Authorization"]);
|
||||
Assert.Equal("en", x.Headers["Accept-Language"]);
|
||||
});
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfer_posts_the_request_json_and_returns_status_and_body()
|
||||
{
|
||||
var h = new Recorder(_ => Json("{\"status\":{\"name\":\"Success\"}}"));
|
||||
var json = DinarakProtocol.BuildTransferRequest("x", 1.5m, "1", 5m, "795000000", DinarakProtocol.SalaryOperation);
|
||||
|
||||
var r = await Client(h).TransferAsync("bearer tok", json);
|
||||
|
||||
Assert.Equal("https://dinarak.invalid/api/transfer/transfer", h.Calls[0].Url);
|
||||
Assert.Equal(json, h.Calls[0].Body);
|
||||
Assert.Equal("000", DinarakProtocol.MapTransferResponse(r.Status, r.Body).Code);
|
||||
using var doc = JsonDocument.Parse(h.Calls[0].Body!);
|
||||
Assert.Equal("bank salary internal", doc.RootElement.GetProperty("OperationName").GetString());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Http_errors_are_returned_not_thrown()
|
||||
{
|
||||
var h = new Recorder(_ => Json("down", HttpStatusCode.BadGateway));
|
||||
var r = await Client(h).TransferAsync("bearer tok", "{}");
|
||||
|
||||
Assert.Equal(502, r.Status);
|
||||
Assert.Equal("103", DinarakProtocol.MapTransferResponse(r.Status, r.Body).Code);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
using System.Net;
|
||||
using System.Text;
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
using Microsoft.Extensions.Options;
|
||||
using NTP.Infrastructure.Integrations;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class JopetrolGatewayTests
|
||||
{
|
||||
private sealed class FakeHandler(Func<HttpRequestMessage, string, HttpResponseMessage> respond) : HttpMessageHandler
|
||||
{
|
||||
public readonly List<(HttpRequestMessage Request, string Body)> Calls = [];
|
||||
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
|
||||
{
|
||||
var body = request.Content is null ? "" : await request.Content.ReadAsStringAsync(cancellationToken);
|
||||
Calls.Add((request, body));
|
||||
return respond(request, body);
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class FakeFactory(HttpMessageHandler handler) : IHttpClientFactory
|
||||
{
|
||||
public HttpClient CreateClient(string name) => new(handler, disposeHandler: false);
|
||||
}
|
||||
|
||||
private static JopetrolGateway Gateway(FakeHandler h, bool enabled = true, string user = "test-user", string password = "test-pass", string url = "https://jopetrol.test/ws.asmx") =>
|
||||
new(new FakeFactory(h), Options.Create(new JopetrolOptions { Enabled = enabled, Url = url, UserName = user, Password = password, TimeoutSeconds = 5 }),
|
||||
NullLogger<JopetrolGateway>.Instance);
|
||||
|
||||
private static string Answer(string text) =>
|
||||
$"""<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="{JopetrolSoap.SoapNamespace}"><soap:Body><sendClaimandUpdateStatusTo7Response xmlns="{JopetrolSoap.ServiceNamespace}"><sendClaimandUpdateStatusTo7Result>{text}</sendClaimandUpdateStatusTo7Result></sendClaimandUpdateStatusTo7Response></soap:Body></soap:Envelope>""";
|
||||
|
||||
private static HttpResponseMessage Ok(string xml) => new(HttpStatusCode.OK) { Content = new StringContent(xml, Encoding.UTF8, "text/xml") };
|
||||
|
||||
[Fact]
|
||||
public void Envelope_carries_the_header_credentials_and_the_two_arguments()
|
||||
{
|
||||
var xml = JopetrolSoap.BuildEnvelope("test-user", "test-pass", "1234567", "20230100041");
|
||||
var doc = System.Xml.Linq.XDocument.Parse(xml); // well formed
|
||||
var tran = System.Xml.Linq.XNamespace.Get(JopetrolSoap.ServiceNamespace);
|
||||
Assert.Equal("test-user", doc.Descendants(tran + "UserName").Single().Value);
|
||||
Assert.Equal("test-pass", doc.Descendants(tran + "Password").Single().Value);
|
||||
Assert.Equal("1234567", doc.Descendants(tran + "TransNumber").Single().Value);
|
||||
Assert.Equal("20230100041", doc.Descendants(tran + "claimNo").Single().Value);
|
||||
Assert.NotNull(doc.Descendants(tran + "sendClaimandUpdateStatusTo7").SingleOrDefault());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Envelope_escapes_xml_in_the_values()
|
||||
{
|
||||
var xml = JopetrolSoap.BuildEnvelope("a&b", "<p>", "1", "2");
|
||||
var tran = System.Xml.Linq.XNamespace.Get(JopetrolSoap.ServiceNamespace);
|
||||
var doc = System.Xml.Linq.XDocument.Parse(xml);
|
||||
Assert.Equal("a&b", doc.Descendants(tran + "UserName").Single().Value);
|
||||
Assert.Equal("<p>", doc.Descendants(tran + "Password").Single().Value);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Answer_is_read_by_local_name()
|
||||
{
|
||||
Assert.Equal("Status Updated successfully To 7", JopetrolSoap.ParseResult(Answer("Status Updated successfully To 7")));
|
||||
Assert.Null(JopetrolSoap.ParseResult("<soap:Envelope xmlns:soap=\"" + JopetrolSoap.SoapNamespace + "\"><soap:Body><soap:Fault/></soap:Body></soap:Envelope>"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Disabled_integration_returns_null_and_calls_nothing()
|
||||
{
|
||||
var h = new FakeHandler((_, _) => Ok(Answer("never")));
|
||||
var result = await Gateway(h, enabled: false).SendClaimAndUpdateStatusTo7Async("1", "2");
|
||||
Assert.Null(result);
|
||||
Assert.Empty(h.Calls);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Enabled_integration_posts_the_envelope_and_returns_the_result_text()
|
||||
{
|
||||
var h = new FakeHandler((_, _) => Ok(Answer("Status Updated successfully To 7")));
|
||||
var result = await Gateway(h).SendClaimAndUpdateStatusTo7Async("1234567", "20230100041");
|
||||
|
||||
Assert.Equal("Status Updated successfully To 7", result);
|
||||
var call = Assert.Single(h.Calls);
|
||||
Assert.Equal(HttpMethod.Post, call.Request.Method);
|
||||
Assert.Equal("https://jopetrol.test/ws.asmx", call.Request.RequestUri!.ToString());
|
||||
Assert.StartsWith("text/xml", call.Request.Content!.Headers.ContentType!.MediaType);
|
||||
Assert.Contains("<tran:TransNumber>1234567</tran:TransNumber>", call.Body);
|
||||
Assert.Contains("<tran:claimNo>20230100041</tran:claimNo>", call.Body);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Answer_without_a_result_element_is_an_empty_text()
|
||||
{
|
||||
var h = new FakeHandler((_, _) => Ok("<html><body>Server error</body></html>"));
|
||||
Assert.Equal("", await Gateway(h).SendClaimAndUpdateStatusTo7Async("1", "2"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Unreadable_answer_is_an_error()
|
||||
{
|
||||
var h = new FakeHandler((_, _) => Ok("not xml at all <<"));
|
||||
await Assert.ThrowsAsync<InvalidOperationException>(() => Gateway(h).SendClaimAndUpdateStatusTo7Async("1", "2"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Enabled_without_credentials_is_refused_before_any_call()
|
||||
{
|
||||
var h = new FakeHandler((_, _) => Ok(Answer("x")));
|
||||
await Assert.ThrowsAsync<InvalidOperationException>(() => Gateway(h, user: "", password: "").SendClaimAndUpdateStatusTo7Async("1", "2"));
|
||||
Assert.Empty(h.Calls);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Options_are_off_by_default()
|
||||
{
|
||||
var o = new JopetrolOptions();
|
||||
Assert.False(o.Enabled);
|
||||
Assert.Equal("", o.UserName);
|
||||
Assert.Equal("", o.Password);
|
||||
Assert.Equal(30, o.TimeoutSeconds);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,159 +0,0 @@
|
|||
using System.IO.Compression;
|
||||
using System.Text;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
using Xunit;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
/// <summary>The refinery Excel reports follow the layout of the legacy report.cfc (font, alignment, header colours, widths, RTL).</summary>
|
||||
public class LegacyReportWorkbookTests
|
||||
{
|
||||
private static string Part(byte[] xlsx, string name)
|
||||
{
|
||||
using var zip = new ZipArchive(new MemoryStream(xlsx), ZipArchiveMode.Read);
|
||||
using var s = zip.GetEntry(name)!.Open();
|
||||
using var r = new StreamReader(s, Encoding.UTF8);
|
||||
return r.ReadToEnd();
|
||||
}
|
||||
|
||||
private static byte[] Sample(IReadOnlyList<(string, string)>? filters = null) =>
|
||||
LegacyReportWorkbook.ToXlsx(new LegacyReport(
|
||||
"شركة نافذ للخدمات اللوجستية", "أرصدة الديزل", filters ?? [("رقم القاطرة", "123")],
|
||||
["متسلسل", "رقم القاطرة", "رقم بطاقة جوبترول", "القيمة التراكمية الحالية"], [100, 150, 150, 150],
|
||||
[[1, "123", "=1+1", 55.5m]]));
|
||||
|
||||
[Fact]
|
||||
public void Sheet_is_right_to_left_with_the_legacy_title_row_and_merges()
|
||||
{
|
||||
var sheet = Part(Sample(), "xl/worksheets/sheet1.xml");
|
||||
Assert.Contains("rightToLeft=\"1\"", sheet);
|
||||
Assert.Contains("<mergeCell ref=\"A1:C1\"/>", sheet);
|
||||
Assert.Contains("<mergeCell ref=\"E1:F1\"/>", sheet);
|
||||
Assert.Contains("شركة نافذ للخدمات اللوجستية", sheet);
|
||||
Assert.Contains("أرصدة الديزل", sheet);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Filters_are_label_value_pairs_on_row_two_and_the_header_is_on_row_four()
|
||||
{
|
||||
var sheet = Part(Sample(), "xl/worksheets/sheet1.xml");
|
||||
Assert.Contains("<c r=\"A2\" s=\"3\" t=\"inlineStr\"><is><t xml:space=\"preserve\">رقم القاطرة</t>", sheet); // label in the header style
|
||||
Assert.Contains("<c r=\"B2\" s=\"4\" t=\"inlineStr\"><is><t xml:space=\"preserve\">123</t>", sheet); // value in the grey style
|
||||
Assert.Contains("<c r=\"A4\" s=\"3\" t=\"inlineStr\"><is><t xml:space=\"preserve\">متسلسل</t>", sheet);
|
||||
Assert.Contains("<c r=\"A5\" s=\"5\"><v>1</v></c>", sheet); // counter, data style
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Styles_use_the_legacy_font_centre_alignment_and_navy_header()
|
||||
{
|
||||
var styles = Part(Sample(), "xl/styles.xml");
|
||||
Assert.Contains("<name val=\"Arial Unicode MS\"/>", styles);
|
||||
Assert.DoesNotContain("Calibri", styles);
|
||||
Assert.Contains("rgb=\"FF003366\"", styles); // navy header fill
|
||||
Assert.Contains("rgb=\"FFC0C0C0\"", styles); // grey filter values
|
||||
Assert.Contains("horizontal=\"center\"", styles);
|
||||
Assert.Contains("horizontal=\"right\"", styles); // company name
|
||||
Assert.Contains("wrapText=\"1\"", styles);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Column_widths_follow_the_legacy_point_widths()
|
||||
{
|
||||
Assert.InRange(LegacyReportWorkbook.Chars(100), 18, 19);
|
||||
Assert.True(LegacyReportWorkbook.Chars(200) > LegacyReportWorkbook.Chars(150));
|
||||
Assert.True(LegacyReportWorkbook.Chars(150) > LegacyReportWorkbook.Chars(100));
|
||||
var sheet = Part(Sample(), "xl/worksheets/sheet1.xml");
|
||||
Assert.Equal(4, System.Text.RegularExpressions.Regex.Matches(sheet, "<col ").Count);
|
||||
Assert.Contains("customWidth=\"1\"", sheet);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Cell_text_starting_with_equals_is_a_string_never_a_formula()
|
||||
{
|
||||
var sheet = Part(Sample(), "xl/worksheets/sheet1.xml");
|
||||
Assert.DoesNotContain("<f>", sheet);
|
||||
Assert.Contains("<t xml:space=\"preserve\">=1+1</t>", sheet);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Sheet_name_has_no_forbidden_characters_and_fits_31_characters()
|
||||
{
|
||||
Assert.Equal("Report", LegacyReportWorkbook.SheetName("[:*?/\\]"));
|
||||
Assert.Equal(31, LegacyReportWorkbook.SheetName(new string('ا', 50)).Length);
|
||||
Assert.Equal("أرصدة الديزل", LegacyReportWorkbook.SheetName("أرصدة الديزل"));
|
||||
}
|
||||
|
||||
private static readonly string[] TransferHeaders =
|
||||
[
|
||||
"متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي للتحميل (كغ)",
|
||||
"الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "صافي قيمة اجور النقل", "الحالة", "تاريخ الاستلام"
|
||||
];
|
||||
|
||||
private static byte[] Transfers(IReadOnlyList<IReadOnlyList<object?>>? rows = null) =>
|
||||
LegacyReportWorkbook.ToTransfersXlsx(new TransfersReport(
|
||||
"شركة نافذ للخدمات اللوجستية", "قائمة ارقام نماذج التفريغ المعدة لصرف أجور النقل",
|
||||
[("صاحب الحساب", "مكتب"), ("الاسم بالانجليزي", "OFFICE"), ("اسم البنك", "بنك"), ("رقم الحساب", "0055"), ("IBAN", "JO83"), ("صافي قيمة اجور النقل", 360.743m)],
|
||||
TransferHeaders, [9.14, 10.86, 16.71, 12.29, 12.71, 24.86, 12.29, 13.57, 13.71, 11.43, 15.43, 15.43, 24.29],
|
||||
rows ?? [[1, "318912", "03/07/2021", 23300L, "26680", "04/07/2021", 35600m, 35600m, "6059378", "7117953", 360.743m, "جاهز للدفع", "08/07/2021 13:37"]]));
|
||||
|
||||
[Fact]
|
||||
public void Transfers_sheet_has_the_legacy_cell_layout()
|
||||
{
|
||||
var sheet = Part(Transfers(), "xl/worksheets/sheet1.xml");
|
||||
Assert.Contains("rightToLeft=\"1\"", sheet);
|
||||
foreach (var m in new[] { "A1:M1", "A2:M2", "A3:M3", "A4:B4", "C4:M4", "A9:B9", "C9:M9", "A10:M10" })
|
||||
Assert.Contains($"<mergeCell ref=\"{m}\"/>", sheet);
|
||||
Assert.Contains("<c r=\"A4\" s=\"2\" t=\"inlineStr\"><is><t xml:space=\"preserve\">صاحب الحساب</t>", sheet); // label on A:B
|
||||
Assert.Contains("<c r=\"C4\" s=\"3\" t=\"inlineStr\"><is><t xml:space=\"preserve\">مكتب</t>", sheet); // value on C:M
|
||||
Assert.Contains("<c r=\"C9\" s=\"3\"><v>360.743</v></c>", sheet); // total, numeric
|
||||
Assert.Contains("<row r=\"11\" ht=\"45\" customHeight=\"1\">", sheet); // captions on row 11
|
||||
Assert.Contains("<c r=\"A11\" s=\"4\" t=\"inlineStr\"><is><t xml:space=\"preserve\">متسلسل</t>", sheet);
|
||||
Assert.Contains("<c r=\"M11\" s=\"4\" t=\"inlineStr\"><is><t xml:space=\"preserve\">تاريخ الاستلام</t>", sheet);
|
||||
Assert.Contains("<c r=\"A12\" s=\"5\"><v>1</v></c>", sheet); // first data row on row 12
|
||||
Assert.Equal(13, System.Text.RegularExpressions.Regex.Matches(sheet, "<col ").Count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Transfers_styles_follow_the_legacy_file()
|
||||
{
|
||||
var styles = Part(Transfers(), "xl/styles.xml");
|
||||
Assert.Contains("<name val=\"Arial Unicode MS\"/>", styles);
|
||||
Assert.Contains("<b/><sz val=\"21\"/>", styles); // banner: Arial bold 21
|
||||
Assert.Contains("rgb=\"FF003366\"", styles); // navy labels and captions
|
||||
Assert.Contains("horizontal=\"right\"", styles); // account values
|
||||
Assert.Contains("horizontal=\"center\"", styles);
|
||||
Assert.DoesNotContain("Calibri", styles);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Transfers_with_no_rows_still_has_the_block_and_the_captions()
|
||||
{
|
||||
var sheet = Part(Transfers([]), "xl/worksheets/sheet1.xml");
|
||||
Assert.Contains("<c r=\"A11\" s=\"4\"", sheet);
|
||||
Assert.DoesNotContain("<row r=\"12\"", sheet);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfers_report_needs_the_bank_account_number()
|
||||
{
|
||||
// validation happens before the repository is touched
|
||||
var svc = new TripReportService(null!);
|
||||
var e = await Assert.ThrowsAsync<NTP.Application.Common.BusinessException>(() => svc.ExchangeAsync(new TripQuery(), default));
|
||||
Assert.Equal("يجب ادخال رقم الحساب", e.Message);
|
||||
await Assert.ThrowsAsync<NTP.Application.Common.BusinessException>(() => svc.ExchangeAsync(new TripQuery(BankAccount: " "), default));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Trip_filters_show_status_captions_and_dates_oldest_first()
|
||||
{
|
||||
var f = TripReportService.Filters(new TripQuery(
|
||||
Tn: " 55 ", StatusCode: "DISCHARGED,'RESD'", LoadingDateFrom: new DateTime(2026, 3, 1), LoadingDateTo: new DateTime(2026, 3, 31),
|
||||
PaymentedDateFrom: new DateTime(2026, 1, 5)));
|
||||
Assert.Equal(("رقم القاطرة", "55"), f[0]);
|
||||
Assert.Equal("الحالة", f[1].Label);
|
||||
Assert.Contains("تم التفريغ", f[1].Value);
|
||||
Assert.Equal(new[] { "من تاريخ الدفع", "من تاريخ التحميل", "الى تاريخ التحميل" }, f.Skip(2).Select(x => x.Label).ToArray());
|
||||
Assert.Equal("05/01/2026", f[2].Value);
|
||||
Assert.Empty(TripReportService.Filters(new TripQuery()));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,373 +0,0 @@
|
|||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
/// <summary>The action service against in-memory fakes: card arithmetic, status rules, what is (not) written when Dinarak refuses.</summary>
|
||||
public class TripActionServiceTests
|
||||
{
|
||||
private sealed class FakeTrips : ITripRepository
|
||||
{
|
||||
public TripRecord Trip { get; set; } = new() { Id = 1, Pn = "633472", Tn = "6021151", StatusCode = "RESD", CurrentBalance = 100m, LoadingDate = new DateTime(2023, 8, 2), NetLoadingWeight = 34560, NetDischargeWeight = 34290, DischargeAuthNo = "26968", OwnerName = "Owner" };
|
||||
public CardInfo? Card { get; set; } = new(7, 100m);
|
||||
public decimal? Diesel { get; set; } = 250m;
|
||||
public decimal? LastCardLogAmount { get; set; } = 150m;
|
||||
public TripWallet? Wallet { get; set; }
|
||||
public List<string> Calls { get; } = [];
|
||||
public List<(string Method, string Old, string New)> Logs { get; } = [];
|
||||
public List<(string Method, decimal Before, decimal After, decimal Amount)> CardLogs { get; } = [];
|
||||
public decimal? CardBalanceSet { get; private set; }
|
||||
public int? ReversedTo { get; private set; }
|
||||
|
||||
public Task<TripRecord?> GetAsync(long id, CancellationToken ct = default) => Task.FromResult<TripRecord?>(Trip);
|
||||
public Task<TripLock?> LockAsync(long id, CancellationToken ct = default) { Calls.Add("lock"); return Task.FromResult<TripLock?>(new(Trip.StatusCode, Trip.DieselCharge)); }
|
||||
public Task<TripWallet?> GetActiveWalletByTruckAsync(string tn, CancellationToken ct = default) => Task.FromResult(Wallet);
|
||||
public Task<TripWallet?> GetWalletAsync(long walletId, CancellationToken ct = default) => Task.FromResult(Wallet);
|
||||
public Task<bool> GetAuditModeAsync(CancellationToken ct = default) => Task.FromResult(false);
|
||||
public Task<decimal?> GetFirstPaymentValueAsync(CancellationToken ct = default) => Task.FromResult<decimal?>(100m);
|
||||
public Task<IReadOnlyList<KeyValuePair<string, string?>>> GetVariablesAsync(DateTime loadingDate, CancellationToken ct = default) =>
|
||||
Task.FromResult<IReadOnlyList<KeyValuePair<string, string?>>>(
|
||||
[
|
||||
new("COMMISSION", "0.95"), new("DIESEL_LITER_PRICE", "0.715"), new("DRIVER_TIP", "20"), new("FIRST_ADVANCE_PAYMENT", "100"),
|
||||
new("PERMIT_DISPATCH", "2.5"), new("TOLERANCE_PERCENTAGE", "0.005"), new("TON_PRICE", "700"), new("TON_WAGE", "17.936"), new("WAYBILL_FEE", "0.75")
|
||||
]);
|
||||
public Task<int?> GetWaterFlagAsync(long id, CancellationToken ct = default) => Task.FromResult<int?>(null);
|
||||
public Task<decimal?> CalculateDieselAsync(long id, CancellationToken ct = default) => Task.FromResult(Diesel);
|
||||
public Task<decimal?> CalculateAmountAsync(long id, CancellationToken ct = default) => Task.FromResult<decimal?>(271.975m);
|
||||
public Task<bool> HasTransferLogAsync(long id, CancellationToken ct = default) => Task.FromResult(true);
|
||||
public Task<IReadOnlyList<TripRecord>> GetTripsOfPeriodAsync(DateTime from, DateTime to, CancellationToken ct = default) => Task.FromResult<IReadOnlyList<TripRecord>>([]);
|
||||
public Task<CardInfo?> GetActiveCardAsync(string tn, CancellationToken ct = default) => Task.FromResult(Card);
|
||||
public Task<decimal?> GetLastCardLogAmountAsync(string pn, string methodName, CancellationToken ct = default) => Task.FromResult(LastCardLogAmount);
|
||||
public Task InsertCardLogAsync(long cardId, string methodName, decimal before, decimal after, decimal amount, string userId, string pn, CancellationToken ct = default)
|
||||
{ CardLogs.Add((methodName, before, after, amount)); return Task.CompletedTask; }
|
||||
public Task UpdateCardBalanceAsync(long cardId, decimal balance, string userId, long tripId, CancellationToken ct = default) { CardBalanceSet = balance; return Task.CompletedTask; }
|
||||
public Task MarkFirstAdvanceAsync(long id, string userId, CancellationToken ct = default) { Calls.Add("first"); return Task.CompletedTask; }
|
||||
public Task MarkSecondAdvanceAsync(long id, string userId, decimal secondPaymentValue, CancellationToken ct = default) { Calls.Add("second:" + secondPaymentValue); return Task.CompletedTask; }
|
||||
public Task MarkAdvanceReversedAsync(long id, string userId, int dieselCharge, CancellationToken ct = default) { ReversedTo = dieselCharge; return Task.CompletedTask; }
|
||||
public Task SaveAmountsAsync(long id, string userId, TripAmounts amounts, CancellationToken ct = default) { Calls.Add("amounts:" + amounts.NetWage); return Task.CompletedTask; }
|
||||
public Task SetStatusReceivedAsync(long id, string userId, string status, CancellationToken ct = default) { Calls.Add("status:" + status); return Task.CompletedTask; }
|
||||
public Task MarkExchangedAsync(long id, string userId, string? remarks, string? paymentOptions, bool setReceived, long? walletId, CancellationToken ct = default) { Calls.Add($"exchanged:{paymentOptions}:{setReceived}:{walletId}"); return Task.CompletedTask; }
|
||||
public Task<decimal> BumpDinarakReferenceAsync(long id, string userId, CancellationToken ct = default) { Calls.Add("bump"); return Task.FromResult(352.11m); }
|
||||
public Task SetVoucherSerialAsync(long id, long serial, CancellationToken ct = default) { Calls.Add("serial:" + serial); return Task.CompletedTask; }
|
||||
public Task ConfirmExchangeAsync(long id, string userId, CancellationToken ct = default) { Calls.Add("confirm"); return Task.CompletedTask; }
|
||||
public Task InsertLogAsync(long tripId, string methodName, string userId, string oldJson, string newJson, CancellationToken ct = default)
|
||||
{ Logs.Add((methodName, oldJson, newJson)); return Task.CompletedTask; }
|
||||
public Task<PagedResult<TripLogRow>> SearchLogAsync(long tripId, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<PagedResult<TripRow>> SearchAsync(TripQuery query, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<IReadOnlyList<TripReportRow>> ReportAsync(TripQuery query, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<IReadOnlyList<DieselReportRow>> DieselReportAsync(DieselReportQuery query, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<IReadOnlyList<CardRow>> CardsAsync(string? tn, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<IReadOnlyList<TripReportRow>> BankReportAsync(BankReportQuery query, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
}
|
||||
|
||||
private sealed class FakeBalances(List<string> calls) : IRemainingBalanceService
|
||||
{
|
||||
public Task<decimal?> GetAsync(string tn, CancellationToken ct = default) => Task.FromResult<decimal?>(null);
|
||||
public Task ResetAfterPaymentAsync(string tn, long tripId, CancellationToken ct = default) { calls.Add("reset-balance"); return Task.CompletedTask; }
|
||||
public Task AddAsync(string tn, decimal delta, long tripId, long variableGroupId, CancellationToken ct = default) => Task.CompletedTask;
|
||||
public Task<TripsResult> RecalculateForPeriodAsync(DateTime startDate, DateTime endDate, long variableGroupId, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
}
|
||||
|
||||
private sealed class FakeAmounts : ITripAmountsService
|
||||
{
|
||||
public Task<TripAmounts> ComputeAsync(TripRecord trip, CancellationToken ct) =>
|
||||
Task.FromResult(TripCalculator.Calculate(new TripWeights(trip.NetLoadingWeight ?? 0, trip.NetDischargeWeight ?? 0, 0, null),
|
||||
TripVariables.FromPairs([new("TON_WAGE", "17.936"), new("TON_PRICE", "700"), new("TOLERANCE_PERCENTAGE", "0.005"), new("DRIVER_TIP", "20"),
|
||||
new("PERMIT_DISPATCH", "2.5"), new("WAYBILL_FEE", "0.75"), new("COMMISSION", "0.95"), new("DIESEL_LITER_PRICE", "0.715"), new("FIRST_ADVANCE_PAYMENT", "100")]), null));
|
||||
}
|
||||
|
||||
private sealed class FakeDinarak(DinarakTransferResult result, DinarakTransferStatus? status = null) : IDinarakGateway, IDinarakReferenceGateway
|
||||
{
|
||||
public int Transfers { get; private set; }
|
||||
public (string Wallet, decimal Amount)? Last { get; private set; }
|
||||
public Task<DinarakTransferResult> TransferAsync(long tripId, string walletNumber, string nnpn, decimal amount, string receiverName, CancellationToken ct = default)
|
||||
{ Transfers++; Last = (walletNumber, amount); return Task.FromResult(result); }
|
||||
public Task<DinarakTransferStatus> GetTransferByMessageIdAsync(long messageId, CancellationToken ct = default) => Task.FromResult(status ?? new(false, "Failed", null));
|
||||
public Task<DinarakTransferStatus> GetTransferByReferenceAsync(decimal reference, CancellationToken ct = default) => Task.FromResult(status ?? new(false, "Failed", null));
|
||||
}
|
||||
|
||||
private sealed class FakeVoucher : IVoucherSerialRepository { public Task<long> NextAsync(CancellationToken ct = default) => Task.FromResult(202600096L); }
|
||||
|
||||
private sealed class FakeUow : IUnitOfWork
|
||||
{
|
||||
public int Committed { get; private set; }
|
||||
public int RolledBack { get; private set; }
|
||||
public Task BeginAsync(CancellationToken ct = default) => Task.CompletedTask;
|
||||
public Task CommitAsync(CancellationToken ct = default) { Committed++; return Task.CompletedTask; }
|
||||
public Task RollbackAsync(CancellationToken ct = default) { RolledBack++; return Task.CompletedTask; }
|
||||
public async Task<T> ExecuteInTransactionAsync<T>(Func<CancellationToken, Task<T>> work, CancellationToken ct = default)
|
||||
{
|
||||
try { var r = await work(ct); Committed++; return r; }
|
||||
catch { RolledBack++; throw; }
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class FakeUser : ICurrentUser
|
||||
{
|
||||
public bool IsAuthenticated => true; public long Id => 16190811; public string UserId => "REF_X"; public string Name => "x"; public string RoleCode => "REFINERY_MGR";
|
||||
public string RoleName => ""; public string Domain => "ASEZA"; public long? LocationId => null; public string LocationName => ""; public long? StkId => null;
|
||||
public long? CompId => null; public long? CompanyId => null; public string CompanyName => ""; public string CompanyCode => ""; public string EmpNo => "";
|
||||
public string Lang => "AR"; public bool IsStaff => false;
|
||||
public bool IsInRole(string roleCode) => false; public bool IsInAnyRole(params string[] roleCodes) => false;
|
||||
}
|
||||
|
||||
private sealed class FakeSettings : ITripSettingsService { public TripOptions Value { get; } = new(); }
|
||||
|
||||
private static (TripActionService Svc, FakeTrips Trips, FakeUow Uow, FakeDinarak Dinarak) Build(FakeDinarak? dinarak = null)
|
||||
{
|
||||
var trips = new FakeTrips();
|
||||
var uow = new FakeUow();
|
||||
var d = dinarak ?? new FakeDinarak(new("000", "SUCCESS"));
|
||||
var svc = new TripActionService(trips, new FakeAmounts(), new FakeBalances(trips.Calls), d, d, new FakeVoucher(), uow, new FakeUser(), new FakeSettings());
|
||||
return (svc, trips, uow, d);
|
||||
}
|
||||
|
||||
private static TripWallet ReadyWallet() => new() { Id = 5, Epayment = 1, WalletNumber = "795000000", OwnerNnpn = 9871012345, OwnerName = "Owner" };
|
||||
|
||||
// ---------------------------------------------------------------- diesel advances
|
||||
[Fact]
|
||||
public async Task First_advance_logs_the_card_movement_and_sets_the_card_to_the_calculated_value()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
var r = await svc.FirstAdvanceAsync(1, default);
|
||||
|
||||
Assert.Equal("تمت العملية بنجاح", r.Message);
|
||||
var log = Assert.Single(trips.CardLogs);
|
||||
Assert.Equal(("FIRST_ADVANCED_PAYMENT", 100m, 250m, 150m), log);
|
||||
Assert.Equal(250m, trips.CardBalanceSet);
|
||||
Assert.Contains("first", trips.Calls);
|
||||
var tripLog = Assert.Single(trips.Logs);
|
||||
Assert.Equal("FIRST_ADVANCED_PAYMENT", tripLog.Method);
|
||||
Assert.Equal("{\"CURRENT_BALANCE\":\"250\"}", tripLog.New);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task First_advance_twice_is_refused_with_the_legacy_text_and_writes_nothing()
|
||||
{
|
||||
var (svc, trips, uow, _) = Build();
|
||||
trips.Trip.DieselCharge = 1;
|
||||
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.FirstAdvanceAsync(1, default));
|
||||
Assert.Equal("تم اجراء دفعة الديزل الاولى مسبقاً", ex.Message);
|
||||
Assert.Empty(trips.CardLogs);
|
||||
Assert.Equal(1, uow.RolledBack);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Advance_without_an_active_card_is_refused()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Card = null;
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.FirstAdvanceAsync(1, default));
|
||||
Assert.Equal("بطاقة تعبئة الديزل غير معرفة", ex.Message);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Second_advance_needs_the_first_and_stores_the_calculated_value()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
await Assert.ThrowsAsync<BusinessException>(() => svc.SecondAdvanceAsync(1, default)); // DieselCharge 0
|
||||
|
||||
trips.Trip.DieselCharge = 1;
|
||||
trips.Trip.StatusCode = "LOADED";
|
||||
await svc.SecondAdvanceAsync(1, default);
|
||||
Assert.Contains("second:250", trips.Calls);
|
||||
Assert.Equal("SECOND_ADVANCED_PAYMENT", trips.CardLogs[0].Method);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task First_advance_reverse_takes_back_the_logged_amount()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.DieselCharge = 1;
|
||||
trips.Card = new CardInfo(7, 250m);
|
||||
|
||||
await svc.FirstAdvanceReverseAsync(1, default);
|
||||
|
||||
Assert.Equal(("FIRST_ADVANCED_PAYMENT_REVERSE", 250m, 100m, -150m), trips.CardLogs[0]);
|
||||
Assert.Equal(100m, trips.CardBalanceSet);
|
||||
Assert.Equal(0, trips.ReversedTo);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Second_advance_reverse_goes_back_to_step_one()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.DieselCharge = 2;
|
||||
trips.Card = new CardInfo(7, 450m);
|
||||
trips.LastCardLogAmount = 200m;
|
||||
|
||||
await svc.SecondAdvanceReverseAsync(1, default);
|
||||
|
||||
Assert.Equal(("SECOND_ADVANCED_PAYMENT_REVERSE", 450m, 250m, -200m), trips.CardLogs[0]);
|
||||
Assert.Equal(1, trips.ReversedTo);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(0, "FIRST_ADVANCED_PAYMENT_REVERSE_IS_EXIST")]
|
||||
[InlineData(2, "CANNOT_FIRST_ADVANCED_PAYMENT_REVERSE")]
|
||||
public async Task First_advance_reverse_checks_the_step(int step, string code)
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.DieselCharge = step;
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.FirstAdvanceReverseAsync(1, default));
|
||||
Assert.Equal(code, ex.Code);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- payment
|
||||
[Fact]
|
||||
public async Task Exchange_pays_through_dinarak_then_marks_the_trip_and_resets_the_balance()
|
||||
{
|
||||
var (svc, trips, _, dinarak) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet();
|
||||
|
||||
await svc.ExchangeAsync(1, default);
|
||||
|
||||
Assert.Equal(1, dinarak.Transfers);
|
||||
Assert.Equal(("795000000", 271.975m), dinarak.Last);
|
||||
Assert.Contains("exchanged::True:5", trips.Calls);
|
||||
Assert.Contains("reset-balance", trips.Calls);
|
||||
Assert.Equal("EXCHANGE", trips.Logs.Single().Method);
|
||||
Assert.Contains("تم الصرف", trips.Logs.Single().New);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Exchange_refused_by_dinarak_keeps_the_trip_and_logs_the_remark()
|
||||
{
|
||||
var (svc, trips, _, _) = Build(new FakeDinarak(new("102", "Insufficient_funds")));
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet();
|
||||
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.ExchangeAsync(1, default));
|
||||
|
||||
Assert.Contains("INSUFFICIENT_FUNDS", ex.Message);
|
||||
Assert.DoesNotContain(trips.Calls, c => c.StartsWith("exchanged"));
|
||||
Assert.DoesNotContain("reset-balance", trips.Calls);
|
||||
Assert.Contains("Insufficient_funds", trips.Logs.Single().New);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Exchange_with_the_integration_off_says_so()
|
||||
{
|
||||
var (svc, trips, _, _) = Build(new FakeDinarak(new("106", "DINARAK_DISABLED")));
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet();
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.ExchangeAsync(1, default));
|
||||
Assert.Equal("DINARAK_DISABLED", ex.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Exchange_stops_before_dinarak_when_the_wallet_is_incomplete_or_the_status_is_wrong()
|
||||
{
|
||||
var (svc, trips, _, dinarak) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet();
|
||||
trips.Wallet.WalletNumber = "";
|
||||
await Assert.ThrowsAsync<BusinessException>(() => svc.ExchangeAsync(1, default));
|
||||
|
||||
trips.Wallet = ReadyWallet();
|
||||
trips.Trip.StatusCode = "RESD";
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.ExchangeAsync(1, default));
|
||||
Assert.Equal("NO_AUTHORITY", ex.Code);
|
||||
Assert.Equal(0, dinarak.Transfers);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Receipt_is_for_bank_transfer_trucks_only()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet(); // e-wallet: receipt refused
|
||||
await Assert.ThrowsAsync<BusinessException>(() => svc.ReceiptAsync(1, default));
|
||||
|
||||
trips.Wallet = new TripWallet { Id = 6, Epayment = 0 };
|
||||
await svc.ReceiptAsync(1, default);
|
||||
Assert.Contains("status:READY_TO_PAY", trips.Calls);
|
||||
Assert.Contains("amounts:271.975", trips.Calls);
|
||||
Assert.Equal("RECEIPT", trips.Logs.Single().Method);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Payment_needs_ready_to_pay_and_resets_the_balance()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = new TripWallet { Id = 6, Epayment = 0 };
|
||||
await Assert.ThrowsAsync<BusinessException>(() => svc.PaymentAsync(1, default));
|
||||
|
||||
trips.Trip.StatusCode = "READY_TO_PAY";
|
||||
await svc.PaymentAsync(1, default);
|
||||
Assert.Contains("exchanged::False:6", trips.Calls);
|
||||
Assert.Contains("reset-balance", trips.Calls);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Cash_payment_sets_the_option_and_orange_does_not_reset_the_balance()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
trips.Wallet = ReadyWallet();
|
||||
|
||||
await svc.CashPaymentAsync(1, default);
|
||||
Assert.Contains("exchanged:CACH_PAYMENT:True:5", trips.Calls);
|
||||
Assert.Contains("reset-balance", trips.Calls);
|
||||
|
||||
trips.Calls.Clear();
|
||||
await svc.OrangePaymentAsync(1, default);
|
||||
Assert.Contains("exchanged:ORANGE_PAYMENT:True:5", trips.Calls);
|
||||
Assert.DoesNotContain("reset-balance", trips.Calls);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Activate_wallet_exchange_refuses_when_dinarak_already_has_the_transfer()
|
||||
{
|
||||
var (svc, trips, _, _) = Build(new FakeDinarak(new("000", "SUCCESS"), new DinarakTransferStatus(true, "Success", null)));
|
||||
trips.Trip.StatusCode = "PENDING_EXCHANGE";
|
||||
trips.Trip.DinarakReferenceId = 352.1m;
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.ActivateWalletExchangeAsync(1, default));
|
||||
Assert.Equal("لايمكن تفعيل الصرف, تم الصرف مسبقا", ex.Message);
|
||||
Assert.DoesNotContain("bump", trips.Calls);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Activate_wallet_exchange_moves_the_reference_when_nothing_was_sent()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.StatusCode = "PENDING_EXCHANGE";
|
||||
trips.Trip.DinarakReferenceId = 352.1m;
|
||||
await svc.ActivateWalletExchangeAsync(1, default);
|
||||
Assert.Contains("bump", trips.Calls);
|
||||
Assert.Equal("{\"DINARAK_REFERENCE_ID\":\"352.11\"}", trips.Logs.Single().New);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Activate_wallet_exchange_refuses_when_the_dinarak_state_cannot_be_read()
|
||||
{
|
||||
var (svc, trips, _, _) = Build(new FakeDinarak(new("000", "SUCCESS"), new DinarakTransferStatus(false, "ERROR", null)));
|
||||
trips.Trip.StatusCode = "PENDING_EXCHANGE";
|
||||
trips.Trip.DinarakReferenceId = 352.1m;
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => svc.ActivateWalletExchangeAsync(1, default));
|
||||
Assert.Equal("DINARAK_STATUS_UNKNOWN", ex.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Print_stores_the_voucher_serial_once()
|
||||
{
|
||||
var (svc, trips, _, _) = Build();
|
||||
trips.Trip.StatusCode = "DISCHARGED";
|
||||
|
||||
var v = await svc.PrintAsync(1, default);
|
||||
Assert.Equal("202600096", v.Serial);
|
||||
Assert.Equal(271.975m, v.Amount);
|
||||
Assert.Contains("serial:202600096", trips.Calls);
|
||||
|
||||
trips.Calls.Clear();
|
||||
trips.Trip.VoucherSerialNumber = 202200001;
|
||||
Assert.Equal("202200001", (await svc.PrintAsync(1, default)).Serial);
|
||||
Assert.DoesNotContain(trips.Calls, c => c.StartsWith("serial"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,230 +0,0 @@
|
|||
using NTP.Application.Refinery.Trips;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class TripCalculatorTests
|
||||
{
|
||||
// REFINERY_VARIABLES group 30 (August 2023), values as stored in the database
|
||||
private static readonly TripVariables August2023 = TripVariables.FromPairs(
|
||||
[
|
||||
new("COMMISSION", "0.95"), new("DIESEL_LITER_PRICE", "0.715"), new("DRIVER_TIP", "20"), new("FIRST_ADVANCE_PAYMENT", "100"),
|
||||
new("PERMIT_DISPATCH", "2.5"), new("TOLERANCE_PERCENTAGE", "0.005"), new("TON_PRICE", "700"), new("TON_WAGE", "17.936"),
|
||||
new("WAYBILL_FEE", "0.75")
|
||||
]);
|
||||
|
||||
[Fact]
|
||||
public void Penalised_trip_matches_the_stored_legacy_figures()
|
||||
{
|
||||
// REFINERY_TRIPS id 77314 (COMPLETE): loaded 34560 kg, discharged 34290 kg, no water
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 0, null), August2023, null);
|
||||
|
||||
Assert.Equal(172m, a.ToleranceQuantity);
|
||||
Assert.Equal(98m, a.PenaltyQuantity);
|
||||
Assert.Equal(68.6m, a.PenaltyAmount);
|
||||
Assert.Equal(34.29m, a.CalculatedQuantityTon);
|
||||
Assert.Equal(615.025m, a.QuantityWage);
|
||||
Assert.Equal(271.975m, a.TripNetWage);
|
||||
Assert.Equal(271.975m, a.NetWage);
|
||||
Assert.Equal(0m, a.RemainingBalance);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Loss_inside_the_tolerance_is_not_penalised()
|
||||
{
|
||||
// id 77683: 39820 / 39770, tolerance floor(199.1) = 199 >= 50
|
||||
var a = TripCalculator.Calculate(new TripWeights(39820, 39770, 0, null), August2023, null);
|
||||
|
||||
Assert.Equal(0m, a.PenaltyQuantity);
|
||||
Assert.Equal(0m, a.PenaltyAmount);
|
||||
Assert.Equal(713.315m, a.QuantityWage);
|
||||
Assert.Equal(438.865m, a.TripNetWage);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Remaining_balance_of_the_truck_is_added_to_the_net_wage_only()
|
||||
{
|
||||
var a = TripCalculator.Calculate(new TripWeights(39820, 39770, 0, null), August2023, -12.5m);
|
||||
|
||||
Assert.Equal(438.865m, a.TripNetWage);
|
||||
Assert.Equal(426.365m, a.NetWage);
|
||||
Assert.Equal(-12.5m, a.RemainingBalance);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Accompanying_water_is_paid_as_if_delivered()
|
||||
{
|
||||
// water 300 kg >= loss 270 kg: the whole loaded weight is paid and nothing is fined
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 300, null), August2023, null);
|
||||
|
||||
Assert.Equal(34.56m, a.CalculatedQuantityTon);
|
||||
Assert.Equal(0m, a.PenaltyAmount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Water_flag_1_ignores_the_water_and_the_tolerance()
|
||||
{
|
||||
// legacy factory 816-819: WATER_FLAG = 1 and water > 0 -> water 0 and tolerance 0, so the full loss is fined
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 300, 1), August2023, null);
|
||||
|
||||
Assert.Equal(270m, a.PenaltyQuantity);
|
||||
Assert.Equal(189m, a.PenaltyAmount);
|
||||
Assert.Equal(34.29m, a.CalculatedQuantityTon);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Ton_price_correction_changes_only_the_penalty_and_skips_the_balance()
|
||||
{
|
||||
var withCorrection = August2023 with { TonPriceCorrection = 800m };
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 0, null), withCorrection, 99m, useTonPriceCorrection: true);
|
||||
|
||||
Assert.Equal(78.4m, a.PenaltyAmount); // 98 kg * 800 / 1000
|
||||
Assert.Equal(a.TripNetWage, a.NetWage);
|
||||
Assert.Equal(0m, a.RemainingBalance);
|
||||
Assert.Equal(271.975m - 9.8m, a.TripNetWage);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Second_advance_is_the_diesel_value_minus_the_first()
|
||||
{
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 0, null), August2023, null);
|
||||
Assert.Equal(350m * 0.715m - 100m, a.SecondAdvancePayment);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Missing_variables_give_a_zero_wage_that_the_payment_rules_refuse()
|
||||
{
|
||||
var empty = TripVariables.FromPairs([]);
|
||||
var a = TripCalculator.Calculate(new TripWeights(34560, 34290, 0, null), empty, null);
|
||||
Assert.Equal(0m, a.QuantityWage);
|
||||
// zero net wage = "price not declared"
|
||||
Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsurePayable(0, 500));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Variables_take_the_first_value_of_a_key_and_ignore_unparsable_values()
|
||||
{
|
||||
var v = TripVariables.FromPairs([new("TON_WAGE", "17.936"), new("TON_WAGE", "99"), new("DRIVER_TIP", "abc")]);
|
||||
Assert.Equal(17.936m, v.TonWage);
|
||||
Assert.Equal(0m, v.DriverTip);
|
||||
}
|
||||
}
|
||||
|
||||
public class TripPaymentRulesTests
|
||||
{
|
||||
[Fact]
|
||||
public void Zero_negative_and_too_big_amounts_are_refused_with_the_legacy_texts()
|
||||
{
|
||||
Assert.Equal("السعر غير معرف لتاريخ التحميل", Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsurePayable(0, 500)).Message);
|
||||
Assert.Equal("الدفع مسموح للمبالغ اكبر من صفر", Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsurePayable(-1, 500)).Message);
|
||||
Assert.Equal("الدفع مسموح فقط للمبالغ اقل من 500 دينار", Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsurePayable(500.001m, 500)).Message);
|
||||
TripPaymentRules.EnsurePayable(500m, 500);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Orange_payment_only_checks_for_zero()
|
||||
{
|
||||
TripPaymentRules.EnsurePayable(-5m, 500, checkSign: false);
|
||||
TripPaymentRules.EnsurePayable(5000m, 500, checkSign: false);
|
||||
Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsurePayable(0, 500, checkSign: false));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(false, 1, "795891836", "1", "x", "CANNOT_COMPLETE_ACTION_NO_PAYMENT_METHOD")]
|
||||
[InlineData(true, 0, "795891836", "1", "x", "THERE_IS_EWALLET_PLEASE_RELOAD_FORM")]
|
||||
[InlineData(true, 1, "", "1", "x", "WALLET_NUMBER_IS_EMPTY")]
|
||||
[InlineData(true, 1, "795891836", "", "x", "OWNER_NNPN_IS_EMPTY")]
|
||||
[InlineData(true, 1, "795891836", "1", "", "REFINERY_OWNER_NNPN_WALLET_IS_EMPTY")]
|
||||
public void Wallet_checks_follow_the_legacy_order(bool exists, int epayment, string wallet, string nnpn, string name, string code)
|
||||
{
|
||||
var ex = Assert.Throws<NTP.Application.Common.BusinessException>(() => TripPaymentRules.EnsureWalletReady(exists, epayment, wallet, nnpn, name));
|
||||
Assert.Equal(code, ex.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Ready_wallet_passes() => TripPaymentRules.EnsureWalletReady(true, 1, "795891836", "9871012345", "اسم");
|
||||
}
|
||||
|
||||
public class TripLogBuilderTests
|
||||
{
|
||||
private static (bool, object?) Old(string key) => key switch
|
||||
{
|
||||
"STATUS_CODE" => (true, "DISCHARGED"),
|
||||
"REMARKS" => (true, ""),
|
||||
"CURRENT_BALANCE" => (true, 100m),
|
||||
_ => (false, null)
|
||||
};
|
||||
|
||||
[Fact]
|
||||
public void Status_and_remarks_are_stored_as_arabic_captions()
|
||||
{
|
||||
var log = TripLogBuilder.Build("EXCHANGE", Old, new Dictionary<string, object?>
|
||||
{
|
||||
["STATUS_CODE"] = "EXCHANGED", ["REMARKS"] = "SUCCESSFULL_EXCHANGE_OPERATION"
|
||||
});
|
||||
|
||||
Assert.NotNull(log);
|
||||
Assert.Contains("\"STATUS_CODE\":\"تم التفريغ\"", log!.Value.OldJson);
|
||||
Assert.Contains("\"STATUS_CODE\":\"تم الصرف\"", log.Value.NewJson);
|
||||
Assert.Contains("\"REMARKS\":\"تمت عملية الصرف بنجاح\"", log.Value.NewJson);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Unchanged_values_and_unknown_columns_are_left_out()
|
||||
{
|
||||
Assert.Null(TripLogBuilder.Build("FIRST_ADVANCED_PAYMENT", Old, new Dictionary<string, object?> { ["CURRENT_BALANCE"] = 100.0m }));
|
||||
Assert.Null(TripLogBuilder.Build("X", Old, new Dictionary<string, object?> { ["NOPE"] = "1" }));
|
||||
|
||||
var changed = TripLogBuilder.Build("FIRST_ADVANCED_PAYMENT", Old, new Dictionary<string, object?> { ["CURRENT_BALANCE"] = 350.5m });
|
||||
Assert.Equal("{\"CURRENT_BALANCE\":\"100\"}", changed!.Value.OldJson);
|
||||
Assert.Equal("{\"CURRENT_BALANCE\":\"350.5\"}", changed.Value.NewJson);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Print_stores_its_arguments_with_empty_old_data()
|
||||
{
|
||||
var log = TripLogBuilder.Build("PRINT", _ => (false, null), new Dictionary<string, object?> { ["NOTES"] = "" });
|
||||
Assert.Equal("{}", log!.Value.OldJson);
|
||||
Assert.Equal("{\"NOTES\":\"\"}", log.Value.NewJson);
|
||||
}
|
||||
}
|
||||
|
||||
public class TripActionRulesTests
|
||||
{
|
||||
[Fact]
|
||||
public void Diesel_buttons_follow_the_diesel_charge_step()
|
||||
{
|
||||
Assert.Contains("firstAdvance", TripActionRules.Available("RESD", 0, null, false, false));
|
||||
var step1 = TripActionRules.Available("LOADED", 1, null, false, false);
|
||||
Assert.Contains("secondAdvance", step1);
|
||||
Assert.Contains("firstAdvanceReverse", step1);
|
||||
Assert.DoesNotContain("secondAdvance", TripActionRules.Available("RESD", 1, null, false, false));
|
||||
Assert.Contains("secondAdvanceReverse", TripActionRules.Available("DISCHARGED", 2, 1, false, false));
|
||||
Assert.DoesNotContain("firstAdvance", TripActionRules.Available("RVKD", 0, null, false, false));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Discharged_trip_offers_exchange_or_audit_for_a_wallet_and_receipt_otherwise()
|
||||
{
|
||||
var wallet = TripActionRules.Available("DISCHARGED", 2, 1, auditMode: false, hasTransferLog: false);
|
||||
Assert.Contains("exchange", wallet);
|
||||
Assert.DoesNotContain("exchangeAudit", wallet);
|
||||
Assert.DoesNotContain("receipt", wallet);
|
||||
Assert.Contains("print", wallet);
|
||||
|
||||
Assert.Contains("exchangeAudit", TripActionRules.Available("DISCHARGED", 2, 1, auditMode: true, hasTransferLog: false));
|
||||
var bank = TripActionRules.Available("DISCHARGED", 2, 0, false, false);
|
||||
Assert.Contains("receipt", bank);
|
||||
Assert.DoesNotContain("exchange", bank);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Payment_follows_receipt_and_confirm_needs_a_transfer_log()
|
||||
{
|
||||
Assert.Contains("payment", TripActionRules.Available("READY_TO_PAY", 2, 0, false, false));
|
||||
var pending = TripActionRules.Available("PENDING_EXCHANGE", 2, 1, true, hasTransferLog: true);
|
||||
Assert.Contains("exchange", pending);
|
||||
Assert.Contains("activateWalletExchange", pending);
|
||||
Assert.Contains("confirmExchange", pending);
|
||||
Assert.DoesNotContain("confirmExchange", TripActionRules.Available("PENDING_EXCHANGE", 2, 1, true, hasTransferLog: false));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using NTP.Application;
|
||||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
using NTP.Application.Refinery.RemainingBalance;
|
||||
using NTP.Application.Refinery.Trips;
|
||||
using NTP.Infrastructure;
|
||||
using NTP.Infrastructure.Integrations;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
/// <summary>The conventionally registered services of the trips slice and the Dinarak gateway resolve (no connection is opened).</summary>
|
||||
public class TripsWiringTests
|
||||
{
|
||||
private static ServiceProvider Build(bool dinarak = false)
|
||||
{
|
||||
var cfg = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?>
|
||||
{
|
||||
["ConnectionStrings:NAFITHTCS"] = "User Id=x;Password=x;Data Source=localhost:1521/x",
|
||||
["ConnectionStrings:NtpSchema"] = "User Id=x;Password=x;Data Source=localhost:1521/x",
|
||||
["Refinery:Dinarak:Enabled"] = dinarak ? "true" : "false",
|
||||
["Refinery:Trips:MaxPaymentAmount"] = "250",
|
||||
}).Build();
|
||||
var services = new ServiceCollection();
|
||||
services.AddLogging();
|
||||
services.AddSingleton<IConfiguration>(cfg);
|
||||
services.AddApplication();
|
||||
services.AddInfrastructure(cfg);
|
||||
services.AddHttpContextAccessor();
|
||||
services.AddScoped<ICurrentUser>(_ => null!);
|
||||
return services.BuildServiceProvider();
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(typeof(ITripQueryService))]
|
||||
[InlineData(typeof(ITripActionService))]
|
||||
[InlineData(typeof(ITripReportService))]
|
||||
[InlineData(typeof(ITripAmountsService))]
|
||||
[InlineData(typeof(IRemainingBalanceService))]
|
||||
[InlineData(typeof(ITripRepository))]
|
||||
[InlineData(typeof(IVoucherSerialRepository))]
|
||||
[InlineData(typeof(IDinarakGateway))]
|
||||
[InlineData(typeof(IDinarakReferenceGateway))]
|
||||
public void Services_resolve(Type service)
|
||||
{
|
||||
using var sp = Build();
|
||||
using var scope = sp.CreateScope();
|
||||
Assert.NotNull(scope.ServiceProvider.GetRequiredService(service));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Settings_are_bound_and_dinarak_is_off_by_default()
|
||||
{
|
||||
using var sp = Build();
|
||||
using var scope = sp.CreateScope();
|
||||
Assert.Equal(250m, scope.ServiceProvider.GetRequiredService<ITripSettingsService>().Value.MaxPaymentAmount);
|
||||
Assert.False(scope.ServiceProvider.GetRequiredService<Microsoft.Extensions.Options.IOptions<DinarakOptions>>().Value.Enabled);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Disabled_gateway_answers_106_without_touching_the_database()
|
||||
{
|
||||
using var sp = Build();
|
||||
using var scope = sp.CreateScope();
|
||||
var r = await scope.ServiceProvider.GetRequiredService<IDinarakGateway>().TransferAsync(1, "795000000", "1", 5m, "x");
|
||||
Assert.Equal("106", r.Code);
|
||||
var s = await scope.ServiceProvider.GetRequiredService<IDinarakReferenceGateway>().GetTransferByReferenceAsync(1.1m);
|
||||
Assert.Equal("DISABLED", s.StatusName);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
using NTP.Application.Refinery.Variables;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class VariablesRulesTests
|
||||
{
|
||||
private static SaveVariablesRequest Request(string start, string end, decimal diesel = 0.615m, decimal wage = 16.855m) => new()
|
||||
{
|
||||
StartDate = DateOnly.Parse(start), EndDate = DateOnly.Parse(end), DieselLiterPrice = diesel, TonWage = wage, TonPrice = 700,
|
||||
DriverTip = 20, PermitDispatch = 2.5m, WaybillFee = 0.75m, Commission = 0.45m, TolerancePercentage = 0.005m, FirstAdvancePayment = 100,
|
||||
};
|
||||
|
||||
private static readonly VariablesPeriod[] Existing =
|
||||
[
|
||||
new(1, new DateTime(2023, 7, 1), new DateTime(2023, 7, 31)),
|
||||
new(2, new DateTime(2023, 8, 1), new DateTime(2023, 8, 31)),
|
||||
];
|
||||
|
||||
[Fact]
|
||||
public void A_free_period_is_accepted() =>
|
||||
Assert.Null(VariablesRules.FirstError(Existing, Request("2023-09-01", "2023-09-30")));
|
||||
|
||||
[Fact]
|
||||
public void Start_inside_another_period_is_refused_first()
|
||||
{
|
||||
var e = VariablesRules.FirstError(Existing, Request("2023-07-15", "2023-09-30"));
|
||||
Assert.Equal(VariablesErrors.StartDateInPreviousPeriod, e!.Value.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void End_inside_another_period_is_refused()
|
||||
{
|
||||
var e = VariablesRules.FirstError(Existing, Request("2023-06-01", "2023-07-01"));
|
||||
Assert.Equal(VariablesErrors.EndDateInPreviousPeriod, e!.Value.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Period_that_swallows_another_is_refused()
|
||||
{
|
||||
var e = VariablesRules.FirstError(Existing, Request("2023-06-15", "2023-09-15"));
|
||||
// the end (09-15) is free and the start (06-15) is free, but both July and August lie inside
|
||||
Assert.Equal(VariablesErrors.DateOverlap, e!.Value.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Period_edges_are_inclusive()
|
||||
{
|
||||
Assert.Equal(VariablesErrors.StartDateInPreviousPeriod, VariablesRules.FirstError(Existing, Request("2023-08-31", "2023-09-30"))!.Value.Code);
|
||||
Assert.Null(VariablesRules.FirstError(Existing, Request("2023-09-01", "2023-09-01")));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(0)]
|
||||
[InlineData(-1)]
|
||||
[InlineData(2)]
|
||||
[InlineData(3.5)]
|
||||
public void Diesel_price_must_be_between_0_and_2_exclusive(double price)
|
||||
{
|
||||
var e = VariablesRules.FirstError([], Request("2024-01-01", "2024-01-31", diesel: (decimal)price));
|
||||
Assert.Equal(VariablesErrors.DieselPriceNotCorrect, e!.Value.Code);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(0)]
|
||||
[InlineData(100)]
|
||||
[InlineData(250)]
|
||||
public void Ton_wage_must_be_between_0_and_100_exclusive(double wage)
|
||||
{
|
||||
var e = VariablesRules.FirstError([], Request("2024-01-01", "2024-01-31", wage: (decimal)wage));
|
||||
Assert.Equal(VariablesErrors.TonWageNotCorrect, e!.Value.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Start_after_end_is_refused_last()
|
||||
{
|
||||
var e = VariablesRules.FirstError([], Request("2024-02-01", "2024-01-31"));
|
||||
Assert.Equal(VariablesErrors.StartAfterEnd, e!.Value.Code);
|
||||
// a bad price is reported before the date order
|
||||
Assert.Equal(VariablesErrors.DieselPriceNotCorrect, VariablesRules.FirstError([], Request("2024-02-01", "2024-01-31", diesel: 5))!.Value.Code);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Values_are_stored_as_plain_invariant_text_for_the_nine_keys()
|
||||
{
|
||||
var v = VariablesRules.ToValues(Request("2024-01-01", "2024-01-31"));
|
||||
Assert.Equal(VariablesRules.SetKeys.OrderBy(k => k), v.Keys.OrderBy(k => k));
|
||||
Assert.Equal("0.615", v["DIESEL_LITER_PRICE"]);
|
||||
Assert.Equal("700", v["TON_PRICE"]);
|
||||
Assert.Equal("0.005", v["TOLERANCE_PERCENTAGE"]);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(700, 700, false)]
|
||||
[InlineData(700, 750, true)]
|
||||
public void Balances_are_recalculated_only_when_the_correction_differs_from_the_ton_price(double price, double correction, bool changes) =>
|
||||
Assert.Equal(changes, VariablesRules.TonPriceChanges((decimal)price, (decimal)correction));
|
||||
|
||||
[Fact]
|
||||
public void Without_a_ton_price_row_nothing_is_recalculated() => Assert.False(VariablesRules.TonPriceChanges(null, 750));
|
||||
}
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class WageClaimRulesTests
|
||||
{
|
||||
[Fact]
|
||||
public void Trip_statuses_keep_only_the_claimable_ones()
|
||||
{
|
||||
var r = WageClaimRules.NormalizeTripStatuses(["ALL", "exchanged", "EXCHANGED,READY_TO_PAY", "RVKD", " discharged "]);
|
||||
Assert.Equal(["EXCHANGED", "READY_TO_PAY", "DISCHARGED"], r);
|
||||
Assert.Empty(WageClaimRules.NormalizeTripStatuses(null));
|
||||
Assert.Empty(WageClaimRules.NormalizeTripStatuses(["ALL"]));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Create_validation_follows_the_legacy_order_and_texts()
|
||||
{
|
||||
var ok = new[] { "EXCHANGED" };
|
||||
var from = new DateOnly(2024, 3, 1);
|
||||
var to = new DateOnly(2024, 3, 31);
|
||||
|
||||
Assert.Equal("يجب اختيار الحالة", Assert.Throws<BusinessException>(() => WageClaimRules.ValidateCreate([], null, null)).Message);
|
||||
Assert.Equal("يجب اختيار التاريخ", Assert.Throws<BusinessException>(() => WageClaimRules.ValidateCreate(ok, from, null)).Message);
|
||||
Assert.Equal("يجب اختيار التاريخ", Assert.Throws<BusinessException>(() => WageClaimRules.ValidateCreate(ok, null, to)).Message);
|
||||
Assert.Equal("لا يجوز ان يكون تاريخ من أكبر من تارخ الى", Assert.Throws<BusinessException>(() => WageClaimRules.ValidateCreate(ok, to, from)).Message);
|
||||
WageClaimRules.ValidateCreate(ok, from, from); // same day is fine
|
||||
WageClaimRules.ValidateCreate(ok, from, to);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Claim_closes_only_when_it_has_trips_and_all_are_exchanged()
|
||||
{
|
||||
Assert.True(WageClaimRules.CanCloseClaim(["EXCHANGED", "EXCHANGED"]));
|
||||
Assert.False(WageClaimRules.CanCloseClaim([]));
|
||||
Assert.False(WageClaimRules.CanCloseClaim(["EXCHANGED", "DISCHARGED"]));
|
||||
Assert.False(WageClaimRules.CanCloseClaim(["READY_TO_PAY"]));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("Status Updated successfully To 7", true)]
|
||||
[InlineData("OK: status updated SUCCESSFULLY to 7 for 123", true)]
|
||||
[InlineData("Status Updated successfully To 6", false)]
|
||||
[InlineData("", false)]
|
||||
[InlineData(null, false)]
|
||||
public void Jopetrol_answer_is_matched_like_findNoCase(string? answer, bool expected) =>
|
||||
Assert.Equal(expected, WageClaimRules.IsStatus7Success(answer));
|
||||
|
||||
[Fact]
|
||||
public void Loading_date_range_ends_at_the_end_of_the_last_day()
|
||||
{
|
||||
// legacy: between 'yyyymmdd000000' and 'yyyymmdd235959'
|
||||
Assert.Equal(new DateTime(2024, 4, 1), WageClaimRules.ExclusiveEnd(new DateOnly(2024, 3, 31)));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Report_line_shows_deductions_negative_like_the_legacy_report()
|
||||
{
|
||||
var line = WageClaimRules.ToReportLine(new WageClaimReportRaw
|
||||
{
|
||||
NetLoadingWeight = 30000, NetDischargeWeight = 29900, ToleranceQuantity = 150, PenaltyQuantity = 12, WaterAmount = 0,
|
||||
DriverTip = 1.5m, PermitDispatch = 2, WaybillFee = 3, DieselLiterPrice = 0.8m, AdvancePaymentForDiesel = 280, Commission = 4, NetWage = 100,
|
||||
});
|
||||
Assert.Equal(100m, line.WeightDifference);
|
||||
Assert.Equal(0m, line.PenaltyQuantity); // difference below the tolerance: no penalty
|
||||
Assert.False(line.WaterExist);
|
||||
Assert.Equal([-1.5m, -2m, -3m, -0.8m, -280m, -4m], [line.DriverTip, line.PermitDispatch, line.WaybillFee, line.DieselLiterPrice, line.AdvancePaymentForDiesel, line.Commission]);
|
||||
Assert.Equal(100m, line.NetWage);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Report_line_keeps_the_penalty_above_the_tolerance_and_a_missing_diesel_advance()
|
||||
{
|
||||
var line = WageClaimRules.ToReportLine(new WageClaimReportRaw
|
||||
{
|
||||
NetLoadingWeight = 30000, NetDischargeWeight = 29700, ToleranceQuantity = 150, PenaltyQuantity = 150, WaterAmount = 20, AdvancePaymentForDiesel = null,
|
||||
});
|
||||
Assert.Equal(300m, line.WeightDifference);
|
||||
Assert.Equal(150m, line.PenaltyQuantity);
|
||||
Assert.True(line.WaterExist);
|
||||
Assert.Equal(0m, line.AdvancePaymentForDiesel);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("NEW", "جديد")]
|
||||
[InlineData("CLOSE", "تم التسديد")]
|
||||
[InlineData("COMPLETE", "مكتمل")]
|
||||
public void Claim_status_captions(string code, string caption) => Assert.Equal(caption, WageClaimRules.ClaimStatusCaption(code));
|
||||
|
||||
[Fact]
|
||||
public void Log_json_keeps_arabic_unescaped()
|
||||
{
|
||||
Assert.Equal("{\"STATUS_CODE\":\"تم التسديد\"}", ClaimLogJson.Status("تم التسديد"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
using NTP.Application.Abstractions;
|
||||
using NTP.Application.Common;
|
||||
using NTP.Application.Refinery.Integrations;
|
||||
using NTP.Application.Refinery.WageClaims;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class WageClaimServiceTests
|
||||
{
|
||||
private sealed class FakeUnit : IUnitOfWork
|
||||
{
|
||||
public Task BeginAsync(CancellationToken ct = default) => Task.CompletedTask;
|
||||
public Task CommitAsync(CancellationToken ct = default) => Task.CompletedTask;
|
||||
public Task RollbackAsync(CancellationToken ct = default) => Task.CompletedTask;
|
||||
public Task<T> ExecuteInTransactionAsync<T>(Func<CancellationToken, Task<T>> work, CancellationToken ct = default) => work(ct);
|
||||
}
|
||||
|
||||
private sealed class FakeUser : ICurrentUser
|
||||
{
|
||||
public bool IsAuthenticated => true;
|
||||
public long Id => 77;
|
||||
public string UserId => "TESTER";
|
||||
public string Name => "t";
|
||||
public string RoleCode => "REFINERY_MGR";
|
||||
public string RoleName => "REFINERY_MGR";
|
||||
public string Domain => "ASEZA";
|
||||
public long? LocationId => null;
|
||||
public string LocationName => "";
|
||||
public long? StkId => null;
|
||||
public long? CompId => null;
|
||||
public long? CompanyId => null;
|
||||
public string CompanyName => "";
|
||||
public string CompanyCode => "";
|
||||
public string EmpNo => "";
|
||||
public string Lang => "AR";
|
||||
public bool IsStaff => false;
|
||||
public bool IsInRole(string roleCode) => true;
|
||||
public bool IsInAnyRole(params string[] roleCodes) => true;
|
||||
}
|
||||
|
||||
private sealed class FakeGateway(Func<string, string?> answer) : IJopetrolGateway
|
||||
{
|
||||
public readonly List<(string Pn, string ClaimNo)> Calls = [];
|
||||
public Task<string?> SendClaimAndUpdateStatusTo7Async(string pn, string claimNo, CancellationToken ct = default)
|
||||
{
|
||||
Calls.Add((pn, claimNo));
|
||||
return Task.FromResult(answer(pn));
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class FakeRepo : IWageClaimRepository
|
||||
{
|
||||
public string ClaimStatus = "NEW";
|
||||
public List<string> TripStatuses = ["EXCHANGED"];
|
||||
public List<TransferTripRow> ToTransfer = [];
|
||||
public int Candidates = 5;
|
||||
public readonly List<string> Writes = [];
|
||||
|
||||
public Task<PagedResult<WageClaimRowDto>> SearchAsync(WageClaimQuery query, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<WageClaimRowDto?> GetAsync(long id, CancellationToken ct = default) =>
|
||||
Task.FromResult<WageClaimRowDto?>(new WageClaimRowDto { Id = id, WageClaimNo = 20230100041, StatusCode = ClaimStatus });
|
||||
public Task<PagedResult<ClaimTripRowDto>> ClaimTripsAsync(long claimId, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<PagedResult<ClaimTripRowDto>> CandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly? from, DateOnly? to, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<int> CountCandidateTripsAsync(IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default) => Task.FromResult(Candidates);
|
||||
public Task<long> InsertClaimAsync(string createdBy, CancellationToken ct = default) { Writes.Add("insert:" + createdBy); return Task.FromResult(9L); }
|
||||
public Task<int> AttachTripsAsync(long claimId, IReadOnlyList<string> statuses, DateOnly from, DateOnly to, CancellationToken ct = default) { Writes.Add("attach:" + claimId + ":" + string.Join('+', statuses)); return Task.FromResult(Candidates); }
|
||||
public Task<IReadOnlyList<string>> ClaimTripStatusesAsync(long claimId, CancellationToken ct = default) => Task.FromResult<IReadOnlyList<string>>(TripStatuses);
|
||||
public Task<int> CompleteClaimTripsAsync(long claimId, string userLogin, long userId, string? ip, CancellationToken ct = default) { Writes.Add("tripsComplete:" + userLogin + ":" + userId); return Task.FromResult(1); }
|
||||
public Task SetClaimStatusAsync(long claimId, string status, string userLogin, CancellationToken ct = default) { Writes.Add("status:" + status); return Task.CompletedTask; }
|
||||
public Task<IReadOnlyList<TransferTripRow>> TripsToTransferAsync(long claimId, CancellationToken ct = default) => Task.FromResult<IReadOnlyList<TransferTripRow>>(ToTransfer);
|
||||
public Task MarkTripTransferredAsync(TransferTripRow trip, long userId, string? ip, CancellationToken ct = default) { Writes.Add("transferred:" + trip.Id); return Task.CompletedTask; }
|
||||
public Task AddLogAsync(long claimId, string method, string? oldData, string? newData, long userId, string? ip, CancellationToken ct = default) { Writes.Add($"log:{method}:{oldData}:{newData}"); return Task.CompletedTask; }
|
||||
public Task<PagedResult<ClaimLogRowDto>> LogAsync(long claimId, PageRequest page, CancellationToken ct = default) => throw new NotSupportedException();
|
||||
public Task<IReadOnlyList<WageClaimReportRaw>> ReportRowsAsync(long claimId, CancellationToken ct = default) => Task.FromResult<IReadOnlyList<WageClaimReportRaw>>([]);
|
||||
}
|
||||
|
||||
private static WageClaimService Service(FakeRepo repo, IJopetrolGateway? gateway = null) =>
|
||||
new(repo, new FakeUnit(), gateway ?? new FakeGateway(_ => null), new FakeUser());
|
||||
|
||||
[Fact]
|
||||
public async Task Create_takes_the_trips_logs_it_and_returns_the_id()
|
||||
{
|
||||
var repo = new FakeRepo();
|
||||
var r = await Service(repo).CreateAsync(new CreateWageClaimRequest(["ALL", "EXCHANGED"], new DateOnly(2024, 3, 1), new DateOnly(2024, 3, 31)), "10.0.0.1", default);
|
||||
Assert.Equal(9, r.Id);
|
||||
Assert.Equal(["insert:TESTER", "attach:9:EXCHANGED", "log:CREATE:{}:{\"STATUS_CODE\":\"NEW\"}"], repo.Writes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Create_without_trips_ready_is_refused_with_the_legacy_text_and_writes_nothing()
|
||||
{
|
||||
var repo = new FakeRepo { Candidates = 0 };
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() =>
|
||||
Service(repo).CreateAsync(new CreateWageClaimRequest(["EXCHANGED"], new DateOnly(2024, 3, 1), new DateOnly(2024, 3, 31)), null, default));
|
||||
Assert.Equal("لا يوجد ارساليات جاهزة لانشاء مطالبة مالية", ex.Message);
|
||||
Assert.Empty(repo.Writes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Close_completes_the_trips_and_the_claim()
|
||||
{
|
||||
var repo = new FakeRepo();
|
||||
await Service(repo).CloseAsync(5, null, default);
|
||||
Assert.Equal(["tripsComplete:TESTER:77", "status:CLOSE", "log:CLAIM_CLOSE:{\"STATUS_CODE\":\"جديد\"}:{\"STATUS_CODE\":\"تم التسديد\"}"], repo.Writes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Close_is_refused_while_a_trip_is_not_exchanged()
|
||||
{
|
||||
var repo = new FakeRepo { TripStatuses = ["EXCHANGED", "DISCHARGED"] };
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => Service(repo).CloseAsync(5, null, default));
|
||||
Assert.Contains("جاهز للدفع او تم التفريغ", ex.Message);
|
||||
Assert.Empty(repo.Writes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Close_and_transfer_need_a_new_claim()
|
||||
{
|
||||
var repo = new FakeRepo { ClaimStatus = "CLOSE" };
|
||||
await Assert.ThrowsAsync<BusinessException>(() => Service(repo).CloseAsync(5, null, default));
|
||||
await Assert.ThrowsAsync<BusinessException>(() => Service(repo).TransferAsync(5, null, default));
|
||||
Assert.Empty(repo.Writes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfer_with_the_integration_disabled_tells_the_user_and_changes_nothing()
|
||||
{
|
||||
var repo = new FakeRepo { ToTransfer = [new() { Id = 1, Pn = "111" }, new() { Id = 2, Pn = "222" }] };
|
||||
var gateway = new FakeGateway(_ => null); // disabled: the gateway answers null
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => Service(repo, gateway).TransferAsync(5, null, default));
|
||||
Assert.Equal("JOPETROL_DISABLED", ex.Code);
|
||||
Assert.Contains("غير مفعلة", ex.Message);
|
||||
Assert.Empty(repo.Writes);
|
||||
Assert.Single(gateway.Calls); // stopped at the first trip
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfer_moves_only_the_trips_the_service_confirms()
|
||||
{
|
||||
var repo = new FakeRepo { ToTransfer = [new() { Id = 1, Pn = "111" }, new() { Id = 2, Pn = "222" }, new() { Id = 3, Pn = "333" }] };
|
||||
var gateway = new FakeGateway(pn => pn == "222" ? "Error" : "Status Updated successfully To 7");
|
||||
var r = await Service(repo, gateway).TransferAsync(5, null, default);
|
||||
|
||||
Assert.Equal(["transferred:1", "transferred:3"], repo.Writes);
|
||||
Assert.Equal("تم ترحيل 2 من 3 ارسالية", r.Message);
|
||||
Assert.All(gateway.Calls, c => Assert.Equal("20230100041", c.ClaimNo));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfer_of_everything_answers_with_the_standard_success_text()
|
||||
{
|
||||
var repo = new FakeRepo { ToTransfer = [new() { Id = 1, Pn = "111" }] };
|
||||
var r = await Service(repo, new FakeGateway(_ => "Status Updated successfully To 7")).TransferAsync(5, null, default);
|
||||
Assert.Equal("تمت العملية بنجاح", r.Message);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Transfer_stops_when_the_service_is_unreachable()
|
||||
{
|
||||
var repo = new FakeRepo { ToTransfer = [new() { Id = 1, Pn = "111" }, new() { Id = 2, Pn = "222" }] };
|
||||
var gateway = new ThrowingGateway();
|
||||
var ex = await Assert.ThrowsAsync<BusinessException>(() => Service(repo, gateway).TransferAsync(5, null, default));
|
||||
Assert.Equal("JOPETROL_FAILED", ex.Code);
|
||||
Assert.Empty(repo.Writes);
|
||||
}
|
||||
|
||||
private sealed class ThrowingGateway : IJopetrolGateway
|
||||
{
|
||||
public Task<string?> SendClaimAndUpdateStatusTo7Async(string pn, string claimNo, CancellationToken ct = default) =>
|
||||
throw new HttpRequestException("down");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,137 +0,0 @@
|
|||
using System.Text.Json;
|
||||
using NTP.Application.Refinery.Wallets;
|
||||
|
||||
namespace NTP.Tests.Refinery;
|
||||
|
||||
public class WalletsRulesTests
|
||||
{
|
||||
private readonly SaveWalletValidator _validator = new();
|
||||
|
||||
private static SaveWalletRequest Wallet() => new()
|
||||
{
|
||||
PaymentMethod = "WALLET", Tn = "6039498", OwnerNnpn = "9671029403", WalletNumber = "0795600199", OwnerName = "نايل محمد",
|
||||
};
|
||||
|
||||
private static SaveWalletRequest Bank() => new()
|
||||
{
|
||||
PaymentMethod = "BANK", Tn = "6060436", OwnerName = "شركة", OwnerNameEnglish = "Company", BankName = "البنك الاسلامي", BankBranch = "الرمثا",
|
||||
Iban = "JO22JIBA0750000979075410400005", BankAccount = "0750979075410400005",
|
||||
};
|
||||
|
||||
private static SaveWalletRequest Driver() => new()
|
||||
{
|
||||
PaymentMethod = "DRIVER_TIP", DriverName = "ناصر عطيه", DriverNnpn = "9871001698", WalletNumber = "795144330",
|
||||
};
|
||||
|
||||
[Theory]
|
||||
[InlineData("0795600199", true)]
|
||||
[InlineData("795600199", true)]
|
||||
[InlineData("0775600199", true)]
|
||||
[InlineData("0765600199", false)] // 76 is not 77/78/79
|
||||
[InlineData("079560019", false)]
|
||||
[InlineData("07956001999", false)]
|
||||
[InlineData("abc", false)]
|
||||
public void Mobile_wallet_number_format(string value, bool ok) => Assert.Equal(ok, WalletsRules.IsMobile(value));
|
||||
|
||||
[Theory]
|
||||
[InlineData("0750979075410400005", true)]
|
||||
[InlineData("12/AB 34", true)]
|
||||
[InlineData("12-34", false)]
|
||||
public void Bank_account_allows_letters_digits_slash_and_space(string value, bool ok) => Assert.Equal(ok, WalletsRules.IsBankAccount(value));
|
||||
|
||||
[Fact]
|
||||
public void The_three_forms_are_valid()
|
||||
{
|
||||
Assert.True(_validator.Validate(Wallet()).IsValid);
|
||||
Assert.True(_validator.Validate(Bank()).IsValid);
|
||||
Assert.True(_validator.Validate(Driver()).IsValid);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Required_fields_per_method()
|
||||
{
|
||||
var w = Wallet(); w.OwnerName = ""; Assert.False(_validator.Validate(w).IsValid);
|
||||
w = Wallet(); w.Tn = ""; Assert.False(_validator.Validate(w).IsValid);
|
||||
w = Wallet(); w.WalletNumber = "123"; Assert.Contains("رقم المحفظة غير صحيح", _validator.Validate(w).Errors.Select(e => e.ErrorMessage));
|
||||
var b = Bank(); b.Iban = ""; Assert.False(_validator.Validate(b).IsValid);
|
||||
b = Bank(); b.BankAccount = "12-3"; Assert.False(_validator.Validate(b).IsValid);
|
||||
b = Bank(); b.OwnerNnpn = "12ab"; Assert.False(_validator.Validate(b).IsValid);
|
||||
var d = Driver(); d.DriverNnpn = ""; Assert.False(_validator.Validate(d).IsValid);
|
||||
d = Driver(); d.DriverName = ""; Assert.False(_validator.Validate(d).IsValid);
|
||||
Assert.False(_validator.Validate(new SaveWalletRequest { PaymentMethod = "CASH" }).IsValid);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Wallet_maps_to_epayment_1_with_the_wallet_number_and_no_bank_data()
|
||||
{
|
||||
var w = WalletsRules.ToWrite(Wallet());
|
||||
Assert.Equal(1, w.Epayment);
|
||||
Assert.Equal(6039498, w.Tn);
|
||||
Assert.Equal(9671029403, w.OwnerNnpn);
|
||||
Assert.Equal("0795600199", w.WalletNumber);
|
||||
Assert.Null(w.Iban);
|
||||
Assert.Null(w.DriverNnpn);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Bank_maps_to_epayment_0_without_wallet_number()
|
||||
{
|
||||
var w = WalletsRules.ToWrite(Bank());
|
||||
Assert.Equal(0, w.Epayment);
|
||||
Assert.Null(w.WalletNumber);
|
||||
Assert.Equal("Company", w.OwnerNameEnglish);
|
||||
Assert.Equal("0750979075410400005", w.BankAccount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Driver_wallet_has_no_truck_and_no_owner()
|
||||
{
|
||||
var w = WalletsRules.ToWrite(Driver());
|
||||
Assert.Equal(1, w.Epayment);
|
||||
Assert.Null(w.Tn);
|
||||
Assert.Null(w.OwnerNnpn);
|
||||
Assert.Equal(9871001698, w.DriverNnpn);
|
||||
Assert.Equal("795144330", w.WalletNumber);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Method_of_a_stored_record()
|
||||
{
|
||||
Assert.Equal("BANK", WalletsRules.MethodOf(new WalletRow { Epayment = 0, Tn = 1 }));
|
||||
Assert.Equal("WALLET", WalletsRules.MethodOf(new WalletRow { Epayment = 1, Tn = 1 }));
|
||||
Assert.Equal("DRIVER_TIP", WalletsRules.MethodOf(new WalletRow { Epayment = 1, Tn = null, DriverNnpn = 5 }));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Update_log_lists_only_the_changed_columns()
|
||||
{
|
||||
var old = new WalletRow { Id = 469, Tn = 6039498, Epayment = 1, OwnerNnpn = 9481009065, OwnerName = "داوود", WalletNumber = "797564486", Iban = "-", BankAccount = "-", BankName = "-" };
|
||||
var req = Wallet(); req.OwnerNnpn = "9731033500"; req.OwnerName = "هاشم"; req.WalletNumber = "0796792005"; req.Tn = "6039498";
|
||||
var diff = WalletsRules.Diff(old, WalletsRules.ToWrite(req));
|
||||
Assert.NotNull(diff);
|
||||
var o = JsonSerializer.Deserialize<Dictionary<string, string>>(diff!.Value.OldData)!;
|
||||
var n = JsonSerializer.Deserialize<Dictionary<string, string>>(diff.Value.NewData)!;
|
||||
Assert.Equal(["OWNER_NAME", "OWNER_NNPN", "WALLET_NUMBER"], o.Keys.OrderBy(k => k));
|
||||
Assert.Equal("داوود", o["OWNER_NAME"]);
|
||||
Assert.Equal("هاشم", n["OWNER_NAME"]);
|
||||
Assert.Equal("9731033500", n["OWNER_NNPN"]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Update_without_changes_has_no_update_log()
|
||||
{
|
||||
var old = new WalletRow { Tn = 6039498, Epayment = 1, OwnerNnpn = 9671029403, OwnerName = "نايل محمد", WalletNumber = "0795600199", Iban = "-", BankAccount = "-", BankName = "-" };
|
||||
Assert.Null(WalletsRules.Diff(old, WalletsRules.ToWrite(Wallet())));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Status_logs_carry_the_arabic_status_captions()
|
||||
{
|
||||
var (o, n) = WalletsRules.StatusChange("ACTIVE", "INACTIVE");
|
||||
Assert.Equal("{\"STATUS_CODE\":\"فعال\"}", o);
|
||||
Assert.Equal("{\"STATUS_CODE\":\"غير فعال\"}", n);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Create_log_is_the_legacy_status_only_json() => Assert.Equal("{\"STATUS_CODE\":\"ACTIVE\"}", WalletsRules.CreateNewData());
|
||||
}
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
import { useEffect, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from 'react';
|
||||
import { useEffect, useMemo, useState, type ReactNode } from 'react';
|
||||
import { keepPreviousData, useQuery } from '@tanstack/react-query';
|
||||
import { useLocation, useSearchParams } from 'react-router-dom';
|
||||
import {
|
||||
alpha, Alert, Badge, Box, Button, Chip, IconButton, ListItemIcon, ListItemText, Menu, MenuItem, Paper, Stack,
|
||||
Table, TableBody, TableCell, TableContainer, TableHead, TablePagination, TableRow, Tooltip, Typography, useTheme,
|
||||
} from '@mui/material';
|
||||
import CheckIcon from '@mui/icons-material/Check';
|
||||
import ContentCopyIcon from '@mui/icons-material/ContentCopy';
|
||||
import FilterListIcon from '@mui/icons-material/FilterList';
|
||||
import MoreVertIcon from '@mui/icons-material/MoreVert';
|
||||
import EditOutlined from '@mui/icons-material/EditOutlined';
|
||||
|
|
@ -257,7 +255,7 @@ export function DataGrid<T>({ meta }: DataGridProps<T>) {
|
|||
{hasActions && actionsBefore && actionsCell(row)}
|
||||
{columns.map((c) => (
|
||||
<TableCell key={c.key} sx={cellSx(c)}>
|
||||
{c.format === 'status' ? <Cell col={c} row={row} /> : <CopyCell><Cell col={c} row={row} /></CopyCell>}
|
||||
<Cell col={c} row={row} />
|
||||
</TableCell>
|
||||
))}
|
||||
{hasActions && !actionsBefore && actionsCell(row)}
|
||||
|
|
@ -328,70 +326,6 @@ function cellSx(c: ColumnMeta<never>) {
|
|||
...(c.hideBelow ? { display: { xs: 'none', [BP[c.hideBelow]]: 'table-cell' } } : {}),
|
||||
};
|
||||
}
|
||||
/** Writes text to the clipboard (async API, with the old execCommand path for contexts where it is unavailable). */
|
||||
async function copyText(text: string) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
} catch {
|
||||
const ta = document.createElement('textarea');
|
||||
ta.value = text;
|
||||
ta.style.position = 'fixed';
|
||||
ta.style.opacity = '0';
|
||||
document.body.appendChild(ta);
|
||||
ta.select();
|
||||
try { document.execCommand('copy'); } finally { document.body.removeChild(ta); }
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A grid cell value with a small copy icon (shown on hover / keyboard focus, always on touch screens). It copies the text the cell
|
||||
* shows; cells without text (icon-only columns) get no icon. No toast: the icon turns into a check mark for a moment.
|
||||
*/
|
||||
export function CopyCell({ children }: { children: ReactNode }) {
|
||||
const { t } = useUi();
|
||||
const ref = useRef<HTMLSpanElement>(null);
|
||||
const [hasText, setHasText] = useState(false);
|
||||
const [done, setDone] = useState(false);
|
||||
useLayoutEffect(() => {
|
||||
const has = (ref.current?.textContent ?? '').trim().length > 0;
|
||||
setHasText((cur) => (cur === has ? cur : has));
|
||||
});
|
||||
useEffect(() => {
|
||||
if (!done) return undefined;
|
||||
const id = window.setTimeout(() => setDone(false), 1200);
|
||||
return () => window.clearTimeout(id);
|
||||
}, [done]);
|
||||
return (
|
||||
<Box
|
||||
component="span"
|
||||
sx={{
|
||||
display: 'inline-flex', alignItems: 'center', gap: 0.5, maxWidth: '100%',
|
||||
'& .copy-btn': { opacity: 0, transition: 'opacity .12s' },
|
||||
'&:hover .copy-btn, & .copy-btn:focus-visible': { opacity: 1 },
|
||||
'@media (hover: none)': { '& .copy-btn': { opacity: 0.6 } },
|
||||
}}
|
||||
>
|
||||
<span ref={ref}>{children}</span>
|
||||
{hasText && (
|
||||
<IconButton
|
||||
className="copy-btn"
|
||||
size="small"
|
||||
title={t('common.copy')}
|
||||
aria-label={t('common.copy')}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation(); // the row click (open) must not fire
|
||||
const text = (ref.current?.textContent ?? '').trim();
|
||||
void copyText(text).then(() => setDone(true));
|
||||
}}
|
||||
sx={{ p: 0.25 }}
|
||||
>
|
||||
{done ? <CheckIcon sx={{ fontSize: 14 }} color="success" /> : <ContentCopyIcon sx={{ fontSize: 14 }} />}
|
||||
</IconButton>
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
function Cell<T>({ col, row }: { col: ColumnMeta<T>; row: T }): ReactNode {
|
||||
const { lang } = useUi();
|
||||
if (col.render) return <>{col.render(row, { lang })}</>;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
export { CopyCell, DataGrid, gridKey } from './DataGrid';
|
||||
export { DataGrid, gridKey } from './DataGrid';
|
||||
export type { DataGridProps } from './DataGrid';
|
||||
export { gridReturnUrl, rememberGridUrl } from './gridReturn';
|
||||
|
|
|
|||
|
|
@ -164,17 +164,12 @@ export function useSaveCompanyDestinations(scac: number | null) {
|
|||
}
|
||||
|
||||
// ---------------------------------------------------------------- CSV / Excel download (bearer token, so not a plain link)
|
||||
export function downloadExport(path: string, params: Record<string, string | number | undefined>, fallbackName: string): Promise<void> {
|
||||
return downloadFile(`${BASE}${path}`, params, fallbackName);
|
||||
}
|
||||
|
||||
/** Authenticated file download of any API path below the versioned base (the bearer token rules out a plain link). */
|
||||
export async function downloadFile(apiPath: string, params: Record<string, string | number | undefined>, fallbackName: string): Promise<void> {
|
||||
export async function downloadExport(path: string, params: Record<string, string | number | undefined>, fallbackName: string): Promise<void> {
|
||||
if (MOCK) return;
|
||||
const qs = new URLSearchParams();
|
||||
for (const [k, v] of Object.entries(params)) if (v !== undefined && v !== '') qs.append(k, String(v));
|
||||
const token = getToken();
|
||||
const res = await fetch(`${API_BASE}${apiPath}?${qs}`, { headers: token ? { Authorization: `Bearer ${token}` } : {} });
|
||||
const res = await fetch(`${API_BASE}${BASE}${path}?${qs}`, { headers: token ? { Authorization: `Bearer ${token}` } : {} });
|
||||
if (!res.ok) {
|
||||
let problem: { detail?: string; title?: string } | undefined;
|
||||
try { problem = await res.json(); } catch { /* not JSON */ }
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue