Skip to content

Commit 3268325

Browse files
committed
fix: settings update
1 parent b287dd7 commit 3268325

File tree

8 files changed

+153
-29
lines changed

8 files changed

+153
-29
lines changed

package-lock.json

Lines changed: 119 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
"dependencies": {
4747
"@contentful/rich-text-plain-text-renderer": "^15.11.1",
4848
"@middy/core": "^2.5.7",
49+
"@middy/http-error-handler": "^2.5.7",
4950
"@middy/http-json-body-parser": "^2.5.7",
51+
"@middy/validator": "^2.5.7",
5052
"aws-sdk": "^2.824.0",
5153
"chrome-aws-lambda": "^10.0.0",
5254
"contentful": "^9.0.3",

src/functions/debitoor/handler.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
httpResponse,
3-
ValidatedEventAPIGatewayProxyEvent,
3+
ValidatedEventAPIGatewayProxyEvent
44
} from '@libs/apiGateway';
55
import { BOOK, LABEL_BILLED, MAIL } from '@libs/constants';
66
import { fetchCompanies } from '@libs/contentful';
@@ -9,7 +9,7 @@ import {
99
bookSendDraftInvoice,
1010
changeCompany,
1111
createDraftInvoices,
12-
CreateDraftInvoicesResponse,
12+
CreateDraftInvoicesResponse
1313
} from '@libs/debitoor';
1414
import { middyfy } from '@libs/lambda';
1515
import {
@@ -18,7 +18,7 @@ import {
1818
fetchTimeEntriesBetween,
1919
filterClientTimeEntriesByCustomer,
2020
filterTimeEntriesByLabel,
21-
sanitizeTimeEntries,
21+
sanitizeTimeEntries
2222
} from '@libs/toggl';
2323
import { clearCaches, getConfig, initTranslate, Logger } from '@libs/utils';
2424
import 'source-map-support/register';
@@ -146,4 +146,4 @@ const handler: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (
146146
}
147147
};
148148

149-
export const main = middyfy(handler);
149+
export const main = middyfy(handler, schema);

src/functions/sheet/handler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
httpResponse,
3-
ValidatedEventAPIGatewayProxyEvent,
3+
ValidatedEventAPIGatewayProxyEvent
44
} from '@libs/apiGateway';
55
import { createCsv } from '@libs/csv';
66
import { middyfy } from '@libs/lambda';
@@ -10,7 +10,7 @@ import {
1010
fetchTimeEntriesBetween,
1111
filterClientTimeEntriesByCustomer,
1212
filterTimeEntriesByLabel,
13-
sanitizeTimeEntries,
13+
sanitizeTimeEntries
1414
} from '@libs/toggl';
1515
import { clearCaches, getConfig, Logger } from '@libs/utils';
1616
import 'source-map-support/register';
@@ -72,4 +72,4 @@ const handler: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (
7272
}
7373
};
7474

75-
export const main = middyfy(handler);
75+
export const main = middyfy(handler, schema);

src/functions/sync-contentful/handler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
22
httpResponse,
3-
ValidatedEventAPIGatewayProxyEvent,
3+
ValidatedEventAPIGatewayProxyEvent
44
} from '@libs/apiGateway';
55
import {
66
updateDebitoorCustomers,
7-
updateDebitoorProducts,
7+
updateDebitoorProducts
88
} from '@libs/debitoor';
99
import { middyfy } from '@libs/lambda';
1010
import { updateTogglClients, updateTogglProjects } from '@libs/toggl';
@@ -27,4 +27,4 @@ const handler: ValidatedEventAPIGatewayProxyEvent<unknown> = async () => {
2727
}
2828
};
2929

30-
export const main = middyfy(handler);
30+
export const main = middyfy(handler, {});

src/libs/debitoor-types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ export interface LogoResponse {
200200
// GENERATED WITH https://jvilk.com/MakeTypes/
201201
export interface Settings {
202202
customerSettings: CustomerSettings;
203+
accountMigratedAt?: unknown;
203204
supplierSettings: SupplierSettings;
204205
invoiceSettings: InvoiceSettings;
205206
quoteSettings: QuoteSettings;

src/libs/debitoor.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,14 @@ export const changeCompanyDetails = async (
182182
settings.companyProfile.webSite = website;
183183
settings.companyProfile.email = email;
184184
settings.companyProfile.logoUrl = logoUrl;
185+
settings.customerSettings.lastCustomerNumber =
186+
settings.customerSettings.lastCustomerNumber ?? 1000;
185187

186188
settings.ccInfo.billingInfo.company = name;
187189

188190
delete settings.vatReported;
191+
delete settings.accountMigratedAt;
192+
delete settings.featuresQuota;
189193

190194
return fetch(`${BASE_URL}/${SETTINGS_PATH}`, {
191195
method: 'PUT',

src/libs/lambda.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
import middy from '@middy/core';
2-
import middyJsonBodyParser from '@middy/http-json-body-parser';
2+
import httpErrorHandler from '@middy/http-error-handler';
3+
import jsonBodyParser from '@middy/http-json-body-parser';
34

4-
export const middyfy = (handler) => middy(handler).use(middyJsonBodyParser());
5+
export const middyfy = (handler, inputSchema) =>
6+
middy(handler)
7+
.use(jsonBodyParser())
8+
// .use(validator({ inputSchema }))
9+
.use(
10+
httpErrorHandler({
11+
logger(error) {
12+
try {
13+
console.dir(error, { depth: null, colors: true });
14+
} catch (error) {
15+
console.log(error);
16+
}
17+
},
18+
})
19+
);

0 commit comments

Comments
 (0)