@stamhoofd/backend 2.39.1 → 2.40.0

package/src/endpoints/global/registration-periods/GetRegistrationPeriodsEndpoint.ts

@@ -1,12 +1,12 @@
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { RegistrationPeriod as RegistrationPeriodStruct } from "@stamhoofd/structures";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { RegistrationPeriod } from '@stamhoofd/models';
 
 type Params = Record<string, never>;
 type Query = undefined;
-type Body = undefined
-type ResponseBody = RegistrationPeriodStruct[]
+type Body = undefined;
+type ResponseBody = RegistrationPeriodStruct[];
 
 /**
  * One endpoint to create, patch and delete members and their registrations and payments
@@ -14,11 +14,11 @@ type ResponseBody = RegistrationPeriodStruct[]
 
 export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/registration-periods", {});
+        const params = Endpoint.parseParameters(request.url, '/registration-periods', {});
 
         if (params) {
             return [true, params as Params];
@@ -27,11 +27,10 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const periods = await RegistrationPeriod.all()
+        const periods = await RegistrationPeriod.all();
 
         return new Response(
-            periods.map(p => p.getStructure())
+            periods.map(p => p.getStructure()),
         );
     }
-
 }

package/src/endpoints/global/registration-periods/PatchRegistrationPeriodsEndpoint.ts

@@ -1,6 +1,6 @@
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder, patchObject } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { RegistrationPeriod as RegistrationPeriodStruct } from "@stamhoofd/structures";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Platform, RegistrationPeriod } from '@stamhoofd/models';
@@ -9,8 +9,8 @@ import { PeriodHelper } from '../../../helpers/PeriodHelper';
 
 type Params = Record<string, never>;
 type Query = undefined;
-type Body = PatchableArrayAutoEncoder<RegistrationPeriodStruct>
-type ResponseBody = RegistrationPeriodStruct[]
+type Body = PatchableArrayAutoEncoder<RegistrationPeriodStruct>;
+type ResponseBody = RegistrationPeriodStruct[];
 
 /**
  * One endpoint to create, patch and delete members and their registrations and payments
@@ -18,14 +18,14 @@ type ResponseBody = RegistrationPeriodStruct[]
 
 export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    bodyDecoder = new PatchableArrayDecoder(RegistrationPeriodStruct as any, RegistrationPeriodStruct.patchType(), StringDecoder) as any as Decoder<ConvertArrayToPatchableArray<RegistrationPeriodStruct[]>>
+    bodyDecoder = new PatchableArrayDecoder(RegistrationPeriodStruct as any, RegistrationPeriodStruct.patchType(), StringDecoder) as any as Decoder<ConvertArrayToPatchableArray<RegistrationPeriodStruct[]>>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "PATCH") {
+        if (request.method !== 'PATCH') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/registration-periods", {});
+        const params = Endpoint.parseParameters(request.url, '/registration-periods', {});
 
         if (params) {
             return [true, params as Params];
@@ -35,22 +35,23 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setUserOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         // Fast throw first (more in depth checking for patches later)
         if (organization) {
             if (!await Context.auth.hasFullAccess(organization.id)) {
-                throw Context.auth.error()
-            } 
-        } else {
+                throw Context.auth.error();
+            }
+        }
+        else {
             if (!Context.auth.hasPlatformFullAccess()) {
-                throw Context.auth.error()
-            } 
+                throw Context.auth.error();
+            }
         }
 
         const periods: RegistrationPeriod[] = [];
 
-        for (const {put} of request.body.getPuts()) {
+        for (const { put } of request.body.getPuts()) {
             const period = new RegistrationPeriod();
             period.id = put.id;
             period.startDate = put.startDate;
@@ -68,9 +69,9 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
 
             if (!model || model.organizationId !== (organization?.id ?? null)) {
                 throw new SimpleError({
-                    code: "not_found",
+                    code: 'not_found',
                     statusCode: 404,
-                    message: "Registration period not found",
+                    message: 'Registration period not found',
                 });
             }
 
@@ -101,9 +102,9 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
 
             if (!model || model.organizationId !== (organization?.id ?? null)) {
                 throw new SimpleError({
-                    code: "not_found",
+                    code: 'not_found',
                     statusCode: 404,
-                    message: "Registration period not found",
+                    message: 'Registration period not found',
                 });
             }
 
@@ -111,11 +112,10 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
         }
 
         // Clear platform cache
-        Platform.clearCache()
+        Platform.clearCache();
 
         return new Response(
-            periods.map(p => p.getStructure())
+            periods.map(p => p.getStructure()),
         );
     }
-
 }

package/src/endpoints/global/webshops/GetWebshopFromDomainEndpoint.ts

@@ -1,10 +1,10 @@
-import { AutoEncoder, Decoder,field, StringDecoder } from "@simonbackx/simple-encoding";
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
+import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
 import { Webshop } from '@stamhoofd/models';
-import { GetWebshopFromDomainResult, Webshop as WebshopStruct, WebshopPreview } from "@stamhoofd/structures";
-import { GoogleTranslateHelper, Sorter } from "@stamhoofd/utility";
+import { GetWebshopFromDomainResult, Webshop as WebshopStruct, WebshopPreview } from '@stamhoofd/structures';
+import { GoogleTranslateHelper, Sorter } from '@stamhoofd/utility';
 type Params = Record<string, never>;
 
 class Query extends AutoEncoder {
@@ -15,7 +15,7 @@ class Query extends AutoEncoder {
     uri: string | null;
 }
 
-type Body = undefined
+type Body = undefined;
 type ResponseBody = GetWebshopFromDomainResult;
 
 /**
@@ -23,20 +23,20 @@ type ResponseBody = GetWebshopFromDomainResult;
  */
 
 export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
-    queryDecoder = Query as Decoder<Query>
+    queryDecoder = Query as Decoder<Query>;
     webshopDomains = [
         ...new Set([
-            ...Object.values(STAMHOOFD.domains.webshop), 
-            ...Object.values(STAMHOOFD.domains.marketing)
-        ])
-    ]
+            ...Object.values(STAMHOOFD.domains.webshop),
+            ...Object.values(STAMHOOFD.domains.marketing),
+        ]),
+    ];
 
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/webshop-from-domain", {});
+        const params = Endpoint.parseParameters(request.url, '/webshop-from-domain', {});
 
         if (params) {
             return [true, params as Params];
@@ -47,141 +47,141 @@ export class GetWebshopFromDomainEndpoint extends Endpoint<Params, Query, Body,
     async handle(request: DecodedRequest<Params, Query, Body>) {
         // check if the domain ends on .stamhoofd.be
         if (!STAMHOOFD.domains.webshop) {
-            throw new Error("Expected environment variable HOSTNAME_WEBSHOP")
+            throw new Error('Expected environment variable HOSTNAME_WEBSHOP');
         }
 
         // Clean up google translate domains -> make sure we can translate register pages
-        request.query.domain = GoogleTranslateHelper.getDomainFromTranslateDomain(request.query.domain)
+        request.query.domain = GoogleTranslateHelper.getDomainFromTranslateDomain(request.query.domain);
 
         if (request.query.uri) {
             for (const domain of this.webshopDomains) {
                 if (request.query.domain === domain) {
                     // Search webshop
-                    const webshop = await Webshop.getByURI(request.query.uri)
+                    const webshop = await Webshop.getByURI(request.query.uri);
 
                     if (!webshop) {
                         throw new SimpleError({
-                            code: "unknown_webshop",
-                            message: "No webshop registered with this name",
-                            statusCode: 404
-                        })
+                            code: 'unknown_webshop',
+                            message: 'No webshop registered with this name',
+                            statusCode: 404,
+                        });
                     }
 
-                    const organization = await Organization.getByID(webshop.organizationId)
+                    const organization = await Organization.getByID(webshop.organizationId);
 
                     if (!organization) {
                         throw new SimpleError({
-                            code: "unknown_organization",
-                            message: "No organization registered with this domain name",
-                            statusCode: 404
-                        })
+                            code: 'unknown_organization',
+                            message: 'No organization registered with this domain name',
+                            statusCode: 404,
+                        });
                     }
 
                     return new Response(GetWebshopFromDomainResult.create({
                         organization: organization.getBaseStructure(),
-                        webshop: WebshopStruct.create(webshop)
+                        webshop: WebshopStruct.create(webshop),
                     }));
                 }
             }
         }
-        
+
         // If ends with the legacy webshop domain
-        if (STAMHOOFD.domains.legacyWebshop && request.query.domain.endsWith("." + STAMHOOFD.domains.legacyWebshop)) {
-            const strippped = request.query.domain.substr(0, request.query.domain.length - ("." + STAMHOOFD.domains.legacyWebshop).length )
-            if (strippped.includes(".")) {
+        if (STAMHOOFD.domains.legacyWebshop && request.query.domain.endsWith('.' + STAMHOOFD.domains.legacyWebshop)) {
+            const strippped = request.query.domain.substr(0, request.query.domain.length - ('.' + STAMHOOFD.domains.legacyWebshop).length);
+            if (strippped.includes('.')) {
                 throw new SimpleError({
-                    code: "invalid_domain",
-                    message: "This domain format is not supported",
-                    statusCode: 404
-                })
+                    code: 'invalid_domain',
+                    message: 'This domain format is not supported',
+                    statusCode: 404,
+                });
             }
 
             // Search for the URI
-            const organization = await Organization.getByURI(strippped)
+            const organization = await Organization.getByURI(strippped);
 
             if (!organization) {
                 throw new SimpleError({
-                    code: "unknown_organization",
-                    message: "No organization registered with this domain name",
-                    statusCode: 404
-                })
+                    code: 'unknown_organization',
+                    message: 'No organization registered with this domain name',
+                    statusCode: 404,
+                });
             }
 
             // Search webshop
-            const webshop = await Webshop.getByLegacyURI(organization.id, request.query.uri ?? "")
+            const webshop = await Webshop.getByLegacyURI(organization.id, request.query.uri ?? '');
 
             if (!webshop) {
                 // Return organization, so we know the locale + can do some custom logic
                 return new Response(GetWebshopFromDomainResult.create({
                     organization: organization.getBaseStructure(),
                     webshop: null,
-                    webshops: []
+                    webshops: [],
                 }));
             }
 
             return new Response(GetWebshopFromDomainResult.create({
                 organization: organization.getBaseStructure(),
-                webshop: WebshopStruct.create(webshop)
+                webshop: WebshopStruct.create(webshop),
             }));
         }
 
         // Check if we have an organization with a custom domain name
 
-        const webshop = await Webshop.getByDomain(request.query.domain, request.query.uri)
+        const webshop = await Webshop.getByDomain(request.query.domain, request.query.uri);
 
         if (!webshop) {
             // If uri is empty, check if we have multiple webshops with the same domain
             // Check organization
             if (!request.query.uri) {
-                const webshops = await Webshop.getByDomainOnly(request.query.domain)
-                const organizationId = Sorter.getMostOccuringElement(webshops.map(w => w.organizationId))
+                const webshops = await Webshop.getByDomainOnly(request.query.domain);
+                const organizationId = Sorter.getMostOccuringElement(webshops.map(w => w.organizationId));
 
                 if (webshops.length == 0 || !organizationId) {
                     throw new SimpleError({
-                        code: "unknown_webshop",
-                        message: "No webshop registered with this domain name",
-                        statusCode: 404
-                    })
+                        code: 'unknown_webshop',
+                        message: 'No webshop registered with this domain name',
+                        statusCode: 404,
+                    });
                 }
 
-                const organization = await Organization.getByID(organizationId)
+                const organization = await Organization.getByID(organizationId);
 
                 if (!organization) {
                     throw new SimpleError({
-                        code: "unknown_webshop",
-                        message: "No webshop registered with this domain name",
-                        statusCode: 404
-                    })
+                        code: 'unknown_webshop',
+                        message: 'No webshop registered with this domain name',
+                        statusCode: 404,
+                    });
                 }
 
                 // Return organization, and the known webshops on this domain
                 return new Response(GetWebshopFromDomainResult.create({
                     organization: organization.getBaseStructure(),
                     webshop: null,
-                    webshops: webshops.map(w => WebshopPreview.create(w)).filter(w => w.isClosed(0) === false).sort((a, b) => Sorter.byStringValue(a.meta.name, b.meta.name))
+                    webshops: webshops.map(w => WebshopPreview.create(w)).filter(w => w.isClosed(0) === false).sort((a, b) => Sorter.byStringValue(a.meta.name, b.meta.name)),
                 }));
             }
-            
+
             throw new SimpleError({
-                code: "unknown_webshop",
-                message: "No webshop registered with this domain name",
-                statusCode: 404
-            })
+                code: 'unknown_webshop',
+                message: 'No webshop registered with this domain name',
+                statusCode: 404,
+            });
         }
 
-        const organization = await Organization.getByID(webshop.organizationId)
+        const organization = await Organization.getByID(webshop.organizationId);
 
         if (!organization) {
             throw new SimpleError({
-                code: "unknown_organization",
-                message: "No organization registered with this domain name",
-                statusCode: 404
-            })
+                code: 'unknown_organization',
+                message: 'No organization registered with this domain name',
+                statusCode: 404,
+            });
         }
 
         return new Response(GetWebshopFromDomainResult.create({
             organization: organization.getBaseStructure(),
-            webshop: WebshopStruct.create(webshop)
+            webshop: WebshopStruct.create(webshop),
         }));
     }
 }

package/src/endpoints/organization/dashboard/billing/GetOrganizationBillingStatusEndpoint.ts

@@ -1,8 +1,8 @@
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { OrganizationBillingStatus } from "@stamhoofd/structures";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { OrganizationBillingStatus } from '@stamhoofd/structures';
 
-import { Context } from "../../../../helpers/Context";
-import { GetUserBilingStatusEndpoint } from "../../../global/registration/GetUserBillingStatusEndpoint";
+import { Context } from '../../../../helpers/Context';
+import { GetUserBilingStatusEndpoint } from '../../../global/registration/GetUserBillingStatusEndpoint';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -11,11 +11,11 @@ type Body = undefined;
 
 export class GetDetailedBillingStatusEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/organization/billing/status", {});
+        const params = Endpoint.parseParameters(request.url, '/organization/billing/status', {});
 
         if (params) {
             return [true, params as Params];
@@ -25,13 +25,13 @@ export class GetDetailedBillingStatusEndpoint extends Endpoint<Params, Query, Bo
 
     async handle(_: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         // If the user has permission, we'll also search if he has access to the organization's key
         if (!await Context.auth.canManageFinances(organization.id)) {
-            throw Context.auth.error()
+            throw Context.auth.error();
         }
-        
+
         return new Response(await GetUserBilingStatusEndpoint.getBillingStatusForObjects([organization.id], null));
     }
 }

package/src/endpoints/organization/dashboard/billing/GetOrganizationDetailedBillingStatusEndpoint.ts

@@ -1,10 +1,10 @@
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { OrganizationDetailedBillingStatus, PaymentStatus } from "@stamhoofd/structures";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { OrganizationDetailedBillingStatus, PaymentStatus } from '@stamhoofd/structures';
 
-import { BalanceItem, Payment } from "@stamhoofd/models";
-import { SQL } from "@stamhoofd/sql";
-import { Context } from "../../../../helpers/Context";
-import { GetUserDetailedBilingStatusEndpoint } from "../../../global/registration/GetUserDetailedBillingStatusEndpoint";
+import { BalanceItem, Payment } from '@stamhoofd/models';
+import { SQL } from '@stamhoofd/sql';
+import { Context } from '../../../../helpers/Context';
+import { GetUserDetailedBilingStatusEndpoint } from '../../../global/registration/GetUserDetailedBillingStatusEndpoint';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -13,13 +13,13 @@ type Body = undefined;
 
 export class GetOrganizationDetailedBillingStatusEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
         if (request.getVersion() <= 334) {
             // Deprecated
-            const params = Endpoint.parseParameters(request.url, "/billing/status/detailed", {});
+            const params = Endpoint.parseParameters(request.url, '/billing/status/detailed', {});
 
             if (params) {
                 return [true, params as Params];
@@ -27,7 +27,7 @@ export class GetOrganizationDetailedBillingStatusEndpoint extends Endpoint<Param
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/organization/billing/status/detailed", {});
+        const params = Endpoint.parseParameters(request.url, '/organization/billing/status/detailed', {});
 
         if (params) {
             return [true, params as Params];
@@ -37,21 +37,21 @@ export class GetOrganizationDetailedBillingStatusEndpoint extends Endpoint<Param
 
     async handle(_: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         // If the user has permission, we'll also search if he has access to the organization's key
         if (!await Context.auth.canManageFinances(organization.id)) {
-            throw Context.auth.error()
+            throw Context.auth.error();
         }
-        
+
         const balanceItemModels = await BalanceItem.balanceItemsForOrganization(organization.id);
 
         const paymentModels = await Payment.select()
             .where('payingOrganizationId', organization.id)
             .andWhere(
-                SQL.whereNot('status', PaymentStatus.Failed)
+                SQL.whereNot('status', PaymentStatus.Failed),
             )
-            .fetch()
+            .fetch();
 
         return new Response(await GetUserDetailedBilingStatusEndpoint.getDetailedBillingStatus(balanceItemModels, paymentModels));
     }

package/src/endpoints/organization/dashboard/documents/GetDocumentTemplateXML.ts

@@ -1,13 +1,13 @@
-import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
-import { SimpleError } from "@simonbackx/simple-errors";
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { SimpleError } from '@simonbackx/simple-errors';
 import { DocumentTemplate } from '@stamhoofd/models';
 
-import { Context } from "../../../../helpers/Context";
+import { Context } from '../../../../helpers/Context';
 
 type Params = { id: string };
 type Query = undefined;
 type Body = undefined;
-type ResponseBody = Buffer
+type ResponseBody = Buffer;
 
 /**
  * One endpoint to create, patch and delete groups. Usefull because on organization setup, we need to create multiple groups at once. Also, sometimes we need to link values and update multiple groups at once
@@ -15,11 +15,11 @@ type ResponseBody = Buffer
 
 export class GetDocumentTemplateXMLEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method != "GET") {
+        if (request.method !== 'GET') {
             return [false];
         }
 
-        const params = Endpoint.parseParameters(request.url, "/organization/document-templates/@id/xml", { id: String});
+        const params = Endpoint.parseParameters(request.url, '/organization/document-templates/@id/xml', { id: String });
 
         if (params) {
             return [true, params as Params];
@@ -29,29 +29,29 @@ export class GetDocumentTemplateXMLEndpoint extends Endpoint<Params, Query, Body
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setOrganizationScope();
-        await Context.authenticate()
+        await Context.authenticate();
 
         if (!await Context.auth.canManageDocuments(organization.id)) {
-            throw Context.auth.error()
+            throw Context.auth.error();
         }
 
-        const template = await DocumentTemplate.getByID(request.params.id)
+        const template = await DocumentTemplate.getByID(request.params.id);
         if (!template || !await Context.auth.canAccessDocumentTemplate(template)) {
-            throw Context.auth.notFoundOrNoAccess("Onbekend document")
+            throw Context.auth.notFoundOrNoAccess('Onbekend document');
         }
 
         // Update documents
         const xml = await template.getRenderedXml(organization);
         if (!xml) {
             throw new SimpleError({
-                code: "failed_generating",
-                message: "Er ging iets mis bij het aanmaken van het document. Probeer later opieuw en neem contact met ons op als het probleem blijft herhalen."
-            })
+                code: 'failed_generating',
+                message: 'Er ging iets mis bij het aanmaken van het document. Probeer later opieuw en neem contact met ons op als het probleem blijft herhalen.',
+            });
         }
 
-        const response = new Response(Buffer.from(xml, 'utf8'))
-        response.headers["content-type"] = "text/plain; charset=utf-8" // avoid JS execution
-        response.headers["content-length"] = Buffer.byteLength(xml, 'utf8').toString()
-        return response
+        const response = new Response(Buffer.from(xml, 'utf8'));
+        response.headers['content-type'] = 'text/plain; charset=utf-8'; // avoid JS execution
+        response.headers['content-length'] = Buffer.byteLength(xml, 'utf8').toString();
+        return response;
     }
 }