Skip to content

Commit

Permalink
MIJN-10042-Bug - change number for migrated invoices (#1759)
Browse files Browse the repository at this point in the history
* MIJN-10042-Bug - change number for migrated invoices

* Update src/server/services/afis/afis-facturen.test.ts

Co-authored-by: Roan Paulus <[email protected]>

---------

Co-authored-by: Roan Paulus <[email protected]>
  • Loading branch information
timvanoostrom and RoanPaulus authored Feb 5, 2025
1 parent 261c46d commit 89c5d34
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 5 deletions.
22 changes: 18 additions & 4 deletions src/server/services/afis/afis-facturen.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ describe('afis-facturen', async () => {
"debtClearingDate": null,
"debtClearingDateFormatted": null,
"documentDownloadLink": "http://bff-api-host/api/v1/services/afis/facturen/document?id=xx-encrypted-xx",
"factuurDocumentId": "1234567890",
"factuurDocumentId": "100012345678902024",
"factuurNummer": "1234567890",
"id": "1234567890",
"id": "100012345678902024",
"link": {
"title": "Factuur 1234567890",
"to": "http://bff-api-host/api/v1/services/afis/facturen/document?id=xx-encrypted-xx",
Expand Down Expand Up @@ -197,9 +197,9 @@ describe('afis-facturen', async () => {
"debtClearingDate": null,
"debtClearingDateFormatted": null,
"documentDownloadLink": "http://bff-api-host/api/v1/services/afis/facturen/document?id=xx-encrypted-xx",
"factuurDocumentId": "INV-2023-010",
"factuurDocumentId": "1000INV-2023-0102024",
"factuurNummer": "INV-2023-010",
"id": "INV-2023-010",
"id": "1000INV-2023-0102024",
"link": {
"title": "Factuur INV-2023-010",
"to": "http://bff-api-host/api/v1/services/afis/facturen/document?id=xx-encrypted-xx",
Expand Down Expand Up @@ -683,6 +683,20 @@ describe('afis-facturen', async () => {
expect(factuurnummerWithoutAccountingDocument).toBe('987654321');
});

describe('getFactuurDocumentId returns correct factuurDocumentId', () => {
const properID = '123456789987654321';
const oldID = '5678998765';
const migratedID = '100056789987652024';
test('Returns same ID', () => {
expect(forTesting.getFactuurDocumentId(properID)).toBe(properID);
});
test('Converts oldID to migratedID', () => {
const rs = forTesting.getFactuurDocumentId(oldID);
expect(rs).toBe(migratedID);
expect(rs.length).toBe(18);
});
});

test('fetchAfisFacturenDeelbetalingen fetches and transforms deelbetalingen correctly', async () => {
const deelbetalingenResponse: AfisInvoicesPartialPaymentsSource = {
feed: {
Expand Down
12 changes: 11 additions & 1 deletion src/server/services/afis/afis-facturen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import { entries } from '../../../universal/helpers/utils';

const DEFAULT_PROFIT_CENTER_NAME = 'Gemeente Amsterdam';
const AFIS_MAX_FACTUREN_TOP = 2000;
const FACTUUR_DOCUMENT_ID_LENGTH = 18;

export const FACTUUR_STATE_KEYS: AfisFactuurState[] = [
'open',
Expand Down Expand Up @@ -166,6 +167,12 @@ function getFactuurnummer(
return factuurNummer;
}

function getFactuurDocumentId(id: string) {
// Migrate old factuur document id to new format
const migratedFactuurId = `1000${id}2024`;
return id.length == FACTUUR_DOCUMENT_ID_LENGTH ? id : migratedFactuurId;
}

function getInvoiceAmount(
invoice: Pick<AfisFactuurPropertiesSource, 'AmountInBalanceTransacCrcy'>,
deelbetalingAmount?: Decimal
Expand All @@ -188,7 +195,9 @@ function transformFactuur(
deelbetalingen?: AfisFactuurDeelbetalingen
): AfisFactuur {
const invoice = replaceXmlNulls(sourceInvoice);
const factuurDocumentId = String(invoice.AccountingDocument);
const factuurDocumentId = getFactuurDocumentId(
String(invoice.AccountingDocument)
);
const factuurNummer = getFactuurnummer(invoice);
const factuurDocumentIdEncrypted = factuurDocumentId
? encryptSessionIdWithRouteIdParam(sessionID, factuurDocumentId)
Expand Down Expand Up @@ -583,6 +592,7 @@ export const forTesting = {
getAccountingDocumentTypesFilter,
getInvoiceAmount,
getFactuurnummer,
getFactuurDocumentId,
replaceXmlNulls,
transformDeelbetalingenResponse,
transformFacturen,
Expand Down

0 comments on commit 89c5d34

Please sign in to comment.