fc-landmark 2.1.3 → 3.0.0

package/dist/tracking.js

@@ -1,93 +1,93 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const globals_1 = require("./globals");
-const xml_js_1 = require("xml-js");
-class Tracking {
-    constructor() {
-    }
-    buildTrackingRequest(args, username, password, test, clientId) {
-        try {
-            let trackRequest = {
-                "Login": {
-                    "Username": username,
-                    "Password": password
-                },
-                "Test": test,
-                "ClientID": clientId,
-                "TrackingNumber": args.tracking_number,
-                "RetrievalType": "Historical"
-            };
-            let request = {
-                "TrackRequest": trackRequest
-            };
-            const xmlData = (0, xml_js_1.js2xml)(request, { compact: true, ignoreComment: true, spaces: 4 });
-            return xmlData;
-        }
-        catch (e) {
-            throw globals_1.MyGlobal.FlclError.create({ className: 'Tracking', methodName: '_buildRequest', message: 'Exception while building the LandMark Tracking request', cause: e, appendChildMsg: true });
-        }
-    }
-    trackInfo(ShipmentRequest) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let configs = {
-                    headers: {
-                        'Content-Type': 'application/xml'
-                    }
-                };
-                let resp = yield globals_1.MyGlobal.axios.post(globals_1.MyGlobal.track_url, ShipmentRequest, configs);
-                (_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'landmark-RAW-RESPOSNE', propertyValue: resp.data });
-                let responsejson = (0, xml_js_1.xml2json)(resp.data, { compact: true, spaces: 4 });
-                return JSON.parse(responsejson);
-            }
-            catch (e) {
-                (_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'landmar-RAW-RESPOSNE', data: { error: e } });
-                (_c = globals_1.MyGlobal.logger) === null || _c === void 0 ? void 0 : _c.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'CREDITS_ERROR', cause: e }));
-                throw e;
-            }
-        });
-    }
-    buildResponse(resp, args) {
-        let response = {
-            reference: args.reference,
-            tracking_number: args.tracking_number,
-            tracking_history: []
-        };
-        if (!Array.isArray(resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'])) {
-            resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'] = [resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event']];
-        }
-        for (let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++) {
-            let history = {};
-            let code = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_text'];
-            if (code == '50' || code == '60') {
-                history.status = "In Progress";
-            }
-            else if (code == '500') {
-                history.status = "Delivered";
-            }
-            else {
-                history.status = "In Transit";
-            }
-            history.status_date = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['DateTime']['_text'];
-            let dateofevent = new Date(history.status_date);
-            history.event_date = dateofevent.getTime();
-            history.status_detail = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['Status']['_text'] || "";
-            history.location = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['Location']['_text'] || '';
-            history.country = '';
-            response.tracking_history.push(history);
-        }
-        return response;
-    }
-}
-exports.default = Tracking;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("./globals");
+const xml_js_1 = require("xml-js");
+class Tracking {
+    constructor() {
+    }
+    buildTrackingRequest(args, username, password, test, clientId) {
+        try {
+            let trackRequest = {
+                "Login": {
+                    "Username": username,
+                    "Password": password
+                },
+                "Test": test,
+                "ClientID": clientId,
+                "TrackingNumber": args.tracking_number,
+                "RetrievalType": "Historical"
+            };
+            let request = {
+                "TrackRequest": trackRequest
+            };
+            const xmlData = (0, xml_js_1.js2xml)(request, { compact: true, ignoreComment: true, spaces: 4 });
+            return xmlData;
+        }
+        catch (e) {
+            throw globals_1.MyGlobal.FlclError.create({ className: 'Tracking', methodName: '_buildRequest', message: 'Exception while building the LandMark Tracking request', cause: e, appendChildMsg: true });
+        }
+    }
+    trackInfo(ShipmentRequest) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let configs = {
+                    headers: {
+                        'Content-Type': 'application/xml'
+                    }
+                };
+                let resp = yield globals_1.MyGlobal.axios.post(globals_1.MyGlobal.track_url, ShipmentRequest, configs);
+                (_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'landmark-RAW-RESPOSNE', propertyValue: resp.data });
+                let responsejson = (0, xml_js_1.xml2json)(resp.data, { compact: true, spaces: 4 });
+                return JSON.parse(responsejson);
+            }
+            catch (e) {
+                (_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'landmar-RAW-RESPOSNE', data: { error: e } });
+                (_c = globals_1.MyGlobal.logger) === null || _c === void 0 ? void 0 : _c.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'CREDITS_ERROR', cause: e }));
+                throw e;
+            }
+        });
+    }
+    buildResponse(resp, args) {
+        let response = {
+            reference: args.reference,
+            tracking_number: args.tracking_number,
+            tracking_history: []
+        };
+        if (!Array.isArray(resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'])) {
+            resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'] = [resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event']];
+        }
+        for (let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++) {
+            let history = {};
+            let code = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_text'];
+            if (code == '50' || code == '60') {
+                history.status = "In Progress";
+            }
+            else if (code == '500') {
+                history.status = "Delivered";
+            }
+            else {
+                history.status = "In Transit";
+            }
+            history.status_date = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['DateTime']['_text'];
+            let dateofevent = new Date(history.status_date);
+            history.event_date = dateofevent.getTime();
+            history.status_detail = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['Status']['_text'] || "";
+            history.location = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['Location']['_text'] || '';
+            history.country = '';
+            response.tracking_history.push(history);
+        }
+        return response;
+    }
+}
+exports.default = Tracking;
 //# sourceMappingURL=tracking.js.map

package/dist/types.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,31 +1,42 @@
-{
-  "name": "fc-landmark",
-  "version": "2.1.3",
-  "description": "landmark Shipment and Tracking API.",
-  "main": "./dist/index.js",
-  "scripts": {
-    "build": "rm -rf ./dist && tsc",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Midhun",
-  "license": "ISC",
-  "dependencies": {
-    "@types/xml2js": "0.4.11",
-    "@types/redis": "^2.8.25",
-    "@types/redlock": "^4.0.1",
-    "@types/uuid": "^8.3.0",
-    "app-root-path": "^3.0.0",
-    "axios": "^0.19.0",
-    "fc-logger": "^4.2.0",
-    "fs": "0.0.1-security",
-    "redis": "^3.0.2",
-    "redlock": "^4.1.0",
-    "request": "^2.88.2",
-    "uuid": "^8.3.0",
-    "xml-js": "1.6.11"
-  },
-  "devDependencies": {
-    "@types/request": "^2.48.7",
-    "typescript": "^4.9.5"
-  }
-}
+{
+  "name": "fc-landmark",
+  "version": "3.0.0",
+  "description": "landmark Shipment and Tracking API.",
+  "main": "./dist/index.js",
+  "scripts": {
+    "build": "rm -rf ./dist && tsc",
+    "test": "jest"
+  },
+  "author": "Midhun",
+  "license": "ISC",
+  "dependencies": {
+    "@types/xml2js": "0.4.11",
+    "@types/redis": "^2.8.25",
+    "@types/redlock": "^4.0.1",
+    "@types/uuid": "^8.3.0",
+    "app-root-path": "^3.0.0",
+    "axios": "^0.19.0",
+    "fc-logger": "^4.2.0",
+    "fs": "0.0.1-security",
+    "redis": "^3.0.2",
+    "redlock": "^4.1.0",
+    "request": "^2.88.2",
+    "uuid": "^8.3.0",
+    "xml-js": "1.6.11"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.19.43",
+    "@types/request": "^2.48.7",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.14",
+    "typescript": "^4.9.5"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "roots": [
+      "<rootDir>/src"
+    ]
+  }
+}

package/src/axios.ts

@@ -1,29 +1,29 @@
-import axios from 'axios';
-import { FlclAxiosMiddleware, ValidObject } from './types';
-import { MyGlobal as app } from './globals';
-
-
-const injectRequestId = (data?: ValidObject) => {
-    if(data) {
-        data.requestId = app.requestId;
-        data.rootRequestId = app.rootRequestId;
-    }
-    return data;
-}
-
-let axiosMiddleware: FlclAxiosMiddleware = {
-    get: (urlPath: string, configs?: ValidObject) => {
-        return axios.get(urlPath, configs);
-    },
-    put: (urlPath: string, data?: ValidObject, configs?: ValidObject) => {
-        return axios.put(urlPath, data, configs);
-    },
-    post: (urlPath: string, data?: ValidObject, configs?: ValidObject) => {
-        return axios.post(urlPath, data, configs);
-    },
-    delete: (urlPath: string, configs?: ValidObject) => {
-        return axios.delete(urlPath, configs);
-    },
-}
-
+import axios from 'axios';
+import { FlclAxiosMiddleware, ValidObject } from './types';
+import { MyGlobal as app } from './globals';
+
+
+const injectRequestId = (data?: ValidObject) => {
+    if(data) {
+        data.requestId = app.requestId;
+        data.rootRequestId = app.rootRequestId;
+    }
+    return data;
+}
+
+let axiosMiddleware: FlclAxiosMiddleware = {
+    get: (urlPath: string, configs?: ValidObject) => {
+        return axios.get(urlPath, configs);
+    },
+    put: (urlPath: string, data?: ValidObject, configs?: ValidObject) => {
+        return axios.put(urlPath, data, configs);
+    },
+    post: (urlPath: string, data?: ValidObject, configs?: ValidObject) => {
+        return axios.post(urlPath, data, configs);
+    },
+    delete: (urlPath: string, configs?: ValidObject) => {
+        return axios.delete(urlPath, configs);
+    },
+}
+
 export default axiosMiddleware;

package/src/core.ts

@@ -1,12 +1,12 @@
-import { MyGlobal as app } from './globals';
-import { FlclLogger, FlclError } from "fc-logger";
-import axiosMiddleware from './axios';
-export const setRequredGlobals = (logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) => {
-    app.logger = logger || undefined;
-    app.flclError = flclerror || undefined;
-    app.rootRequestId = rootRequestId || '';
-    app.requestId = requestId || '';
-    app.axios = axiosMiddleware;
-    app.ship_url = "https://api.landmarkglobal.com/v2/Import.php",
-    app.track_url = "https://api.landmarkglobal.com/v2/Track.php"
-}
+import { MyGlobal as app } from './globals';
+import { FlclLogger, FlclError } from "fc-logger";
+import axiosMiddleware from './axios';
+export const setRequredGlobals = (logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) => {
+    app.logger = logger || undefined;
+    app.flclError = flclerror || undefined;
+    app.rootRequestId = rootRequestId || '';
+    app.requestId = requestId || '';
+    app.axios = axiosMiddleware;
+    app.ship_url = "https://api.landmarkglobal.com/v2/Import.php",
+    app.track_url = "https://api.landmarkglobal.com/v2/Track.php"
+}

package/src/globals.ts

@@ -1,5 +1,5 @@
-import { AppObj } from './types';
-
-export var MyGlobal: Partial<AppObj> = {
-
+import { AppObj } from './types';
+
+export var MyGlobal: Partial<AppObj> = {
+
 };

package/src/index.ts

@@ -1,3 +1,3 @@
-export  { LandMark } from './landmark';
-
+export  { LandMark } from './landmark';
+
 //export default ECMS;

package/src/landmark.ts

@@ -1,67 +1,67 @@
-import Shipment from './shipment';
-import Tracking from './tracking';
-import { setRequredGlobals } from './core';
-import { MyGlobal as app } from './globals';
-import {FlavorcloudShipmentResponse, FlavorcloudTrackingResponse} from './types';
-import { FlclLogger, FlclError } from "fc-logger";
-export class LandMark {
-    private username : string;
-    private password : string;
-    private test : boolean;
-    private clientId : number;
-    private vendorEORINumber : string;
-    private vendorIOSSNumber : string;
-    constructor(username:string,password:string,clientId:number,test:boolean,vendorEORINumber:string,vendorIOSSNumber:string, logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) {
-        this.username = username;
-        this.password = password;
-        this.test = test;
-        this.clientId = clientId;
-        this.vendorEORINumber = vendorEORINumber;
-        this.vendorIOSSNumber = vendorIOSSNumber;        
-        setRequredGlobals(logger, flclerror, rootRequestId, requestId);
-    }
-
-    async createShipmet(args: any, dangerousGoodsDeatils: any = "", regionValue: string = "") {
-        try {
-            
-            let shipObj = new Shipment();
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args});
-            let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args, dangerousGoodsDeatils, this.username,this.password,this.test,this.clientId,this.vendorEORINumber,this.vendorIOSSNumber, regionValue);
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest});
-            let landmarkShipmentRes: any = await shipObj.createShipment(landmarkShipmentRequest);
-            if(landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']){
-                const rawErrors = landmarkShipmentRes['ImportResponse']['Errors']['Error'];
-                const errorArray = Array.isArray(rawErrors) ? rawErrors : [rawErrors];
-                const messages = errorArray.map((e: any) => e?.['ErrorMessage']?.['_text'] ?? 'Unknown Landmark error').join('; ');
-                throw new Error(messages);
-            }
-            let response: FlavorcloudShipmentResponse =  shipObj.buildResponse(landmarkShipmentRes, args);
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'response', propertyValue: response});
-            return response;
-        } catch(e) {
-            app.logger?.error(app.flclError?.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while creating shipment in Landmark'}));
-            throw e;
-        }
-    }
-    
-    async getTrackingInfo(args: any) {
-        try {
-            
-            let trackObj = new Tracking();
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkInput', propertyValue: args});
-            let landmarkTrackRequest: string = trackObj.buildTrackingRequest(args,this.username,this.password,this.test,this.clientId);
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest});
-            let landMarkTrackingRes: any = await trackObj.trackInfo(landmarkTrackRequest);
-            if(landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']){
-                throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text'])  ;
-            }
-            let response: FlavorcloudTrackingResponse =  trackObj.buildResponse(landMarkTrackingRes, args);
-            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'response', propertyValue: response});
-            return response;
-        } catch(e) {
-            app.logger?.error(app.flclError?.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while get trackinfo in Landmark'}));
-            throw e;
-        }
-    }
-}
- 
+import Shipment from './shipment';
+import Tracking from './tracking';
+import { setRequredGlobals } from './core';
+import { MyGlobal as app } from './globals';
+import {FlavorcloudShipmentResponse, FlavorcloudTrackingResponse} from './types';
+import { FlclLogger, FlclError } from "fc-logger";
+export class LandMark {
+    private username : string;
+    private password : string;
+    private test : boolean;
+    private clientId : number;
+    private vendorEORINumber : string;
+    private vendorIOSSNumber : string;
+    constructor(username:string,password:string,clientId:number,test:boolean,vendorEORINumber:string,vendorIOSSNumber:string, logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) {
+        this.username = username;
+        this.password = password;
+        this.test = test;
+        this.clientId = clientId;
+        this.vendorEORINumber = vendorEORINumber;
+        this.vendorIOSSNumber = vendorIOSSNumber;        
+        setRequredGlobals(logger, flclerror, rootRequestId, requestId);
+    }
+
+    async createShipmet(args: any, dangerousGoodsDeatils: any = "", regionValue: string = "") {
+        try {
+            
+            let shipObj = new Shipment();
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args});
+            let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args, dangerousGoodsDeatils, this.username,this.password,this.test,this.clientId,this.vendorEORINumber,this.vendorIOSSNumber, regionValue);
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest});
+            let landmarkShipmentRes: any = await shipObj.createShipment(landmarkShipmentRequest);
+            if(landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']){
+                const rawErrors = landmarkShipmentRes['ImportResponse']['Errors']['Error'];
+                const errorArray = Array.isArray(rawErrors) ? rawErrors : [rawErrors];
+                const messages = errorArray.map((e: any) => e?.['ErrorMessage']?.['_text'] ?? 'Unknown Landmark error').join('; ');
+                throw new Error(messages);
+            }
+            let response: FlavorcloudShipmentResponse =  shipObj.buildResponse(landmarkShipmentRes, args);
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'response', propertyValue: response});
+            return response;
+        } catch(e) {
+            app.logger?.error(app.flclError?.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while creating shipment in Landmark'}));
+            throw e;
+        }
+    }
+    
+    async getTrackingInfo(args: any) {
+        try {
+            
+            let trackObj = new Tracking();
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkInput', propertyValue: args});
+            let landmarkTrackRequest: string = trackObj.buildTrackingRequest(args,this.username,this.password,this.test,this.clientId);
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest});
+            let landMarkTrackingRes: any = await trackObj.trackInfo(landmarkTrackRequest);
+            if(landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']){
+                throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text'])  ;
+            }
+            let response: FlavorcloudTrackingResponse =  trackObj.buildResponse(landMarkTrackingRes, args);
+            app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'response', propertyValue: response});
+            return response;
+        } catch(e) {
+            app.logger?.error(app.flclError?.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while get trackinfo in Landmark'}));
+            throw e;
+        }
+    }
+}
+