@vendit-dev/thirdparty-adapters 0.4.0-beta.9 → 0.4.1-beta.1

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+## PR 개요
+
+- Jira Ticket: VENDIT-
+- Notion Ticket link:
+- 요약:
+- 예상 PR 소요시간:
+- 요청 리뷰어:
+- 요청 PR Due Date:
+
+## 변경사항 상세
+
+-
+
+## References
+
+- 참고 문서, 스크린샷, 기타 자료 등등...

package/lib/adapters/amanoKorea.js

@@ -84,81 +84,69 @@ var AmanoKoreaAdapter = /** @class */ (function () {
         this.getAccommodationAuthInfo = function (_a) {
             var accommodationId = _a.accommodationId;
             return __awaiter(_this, void 0, void 0, function () {
-                var existingAuth, parsedCredential, lockId, lockHash, parsedCredential_1, newAuth, parsedCredential, err_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var existingAuth, parsedCredential, _b, authorization, apiHost, lotAreaNo, discCodeNo, lockId, lockHash, newAuth, parsedCredential, err_1;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0: return [4 /*yield*/, this.redis.get(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }))];
                         case 1:
-                            existingAuth = _b.sent();
-                            console.log('🚀 ~ file: amanoKorea.ts:113 ~ AmanoKoreaAdapter ~ existingAuth:', existingAuth);
+                            existingAuth = _c.sent();
                             if (existingAuth) {
                                 parsedCredential = this.parseJSONSafe(existingAuth);
-                                console.log('🚀 ~ file: amanoKorea.ts:111 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential);
-                                if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.authorization) {
+                                if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.credential) {
+                                    _b = this.parseJSONSafe(parsedCredential.credential), authorization = _b.authorization, apiHost = _b.apiHost, lotAreaNo = _b.lotAreaNo, discCodeNo = _b.discCodeNo;
                                     this.setAuthorization({
-                                        authorization: parsedCredential.authorization,
+                                        authorization: authorization,
                                     });
-                                    this.API_HOST = parsedCredential.apiHost;
+                                    this.lotAreaNo = lotAreaNo;
+                                    this.discCodeNo = discCodeNo;
+                                    this.API_HOST = apiHost;
                                 }
                                 return [2 /*return*/, this.parseJSONSafe(existingAuth)];
                             }
                             lockId = "AMANO-HKEY|" + accommodationId;
                             return [4 /*yield*/, this.mutexLock.getMutexLock(lockId)];
                         case 2:
-                            lockHash = _b.sent();
-                            return [4 /*yield*/, this.redis.get(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }))];
+                            lockHash = _c.sent();
+                            _c.label = 3;
                         case 3:
-                            existingAuth = _b.sent();
-                            _b.label = 4;
-                        case 4:
-                            _b.trys.push([4, 9, 10, 12]);
-                            if (existingAuth) {
-                                parsedCredential_1 = this.parseJSONSafe(existingAuth);
-                                console.log('🚀 ~ file: amanoKorea.ts:124 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential_1);
-                                if (parsedCredential_1 === null || parsedCredential_1 === void 0 ? void 0 : parsedCredential_1.authorization) {
-                                    this.setAuthorization({
-                                        authorization: parsedCredential_1.authorization,
-                                    });
-                                    this.API_HOST = parsedCredential_1.apiHost;
-                                }
-                                return [2 /*return*/, this.parseJSONSafe(existingAuth)];
-                            }
+                            _c.trys.push([3, 8, 9, 11]);
                             return [4 /*yield*/, this.authenticator.getThirdPartyCredential({
                                     accommodationId: accommodationId,
                                     provider: this.PROVIDER_KEY,
                                 })];
-                        case 5:
-                            newAuth = _b.sent();
-                            if (!(!newAuth || !(newAuth === null || newAuth === void 0 ? void 0 : newAuth.credential))) return [3 /*break*/, 7];
+                        case 4:
+                            newAuth = _c.sent();
+                            if (!(!newAuth || !(newAuth === null || newAuth === void 0 ? void 0 : newAuth.credential))) return [3 /*break*/, 6];
                             return [4 /*yield*/, this.redis.set(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }), 'NOT_FOUND', 'EX', 60 * 5)];
-                        case 6:
-                            _b.sent();
+                        case 5:
+                            _c.sent();
                             return [2 /*return*/, false];
-                        case 7:
+                        case 6:
                             parsedCredential = this.parseJSONSafe(newAuth.credential);
-                            console.log('🚀 ~ file: amanoKorea.ts:151 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential);
                             if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.authorization) {
                                 this.setAuthorization({
                                     authorization: parsedCredential.authorization,
                                 });
+                                this.lotAreaNo = parsedCredential.lotAreaNo;
+                                this.discCodeNo = parsedCredential.discCodeNo;
                                 this.API_HOST = parsedCredential.apiHost;
                             }
                             else {
                                 throw new Error('Authorization is not found');
                             }
                             return [4 /*yield*/, this.redis.set(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }), JSON.stringify(newAuth), 'EX', 60 * 5)];
-                        case 8:
-                            _b.sent();
+                        case 7:
+                            _c.sent();
                             return [2 /*return*/, parsedCredential];
-                        case 9:
-                            err_1 = _b.sent();
+                        case 8:
+                            err_1 = _c.sent();
                             console.log(err_1);
                             throw err_1;
-                        case 10: return [4 /*yield*/, this.mutexLock.unlockMutexLock(lockId, lockHash)];
-                        case 11:
-                            _b.sent();
+                        case 9: return [4 /*yield*/, this.mutexLock.unlockMutexLock(lockId, lockHash)];
+                        case 10:
+                            _c.sent();
                             return [7 /*endfinally*/];
-                        case 12: return [2 /*return*/];
+                        case 11: return [2 /*return*/];
                     }
                 });
             });
@@ -170,7 +158,7 @@ var AmanoKoreaAdapter = /** @class */ (function () {
         this.callAPI = function (_a) {
             var directory = _a.directory, resources = _a.resources;
             return __awaiter(_this, void 0, void 0, function () {
-                var fetchResult, fetchResultJson, data, err_2;
+                var fetchResult, fetchResultJson, err_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -192,8 +180,7 @@ var AmanoKoreaAdapter = /** @class */ (function () {
                             return [4 /*yield*/, (fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.json())];
                         case 3:
                             fetchResultJson = _b.sent();
-                            data = fetchResultJson.data;
-                            return [2 /*return*/, data];
+                            return [2 /*return*/, fetchResultJson];
                         case 4:
                             err_2 = _b.sent();
                             console.error('err', err_2);
@@ -220,10 +207,13 @@ var AmanoKoreaAdapter = /** @class */ (function () {
         // };
         // 방문차량 등록 내역 조회
         this.getPreDiscountListInfo = function (resources) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+            var _a, lotAreaNo, discCodeNo;
+            return __generator(this, function (_b) {
+                _a = this, lotAreaNo = _a.lotAreaNo, discCodeNo = _a.discCodeNo;
                 return [2 /*return*/, this.callAPI({
                         directory: 'getPreDiscountListInfo.do',
-                        resources: resources,
+                        resources: __assign(__assign({}, resources), { lotAreaNo: lotAreaNo,
+                            discCodeNo: discCodeNo }),
                     })];
             });
         }); };

package/lib/adapters/smartAccess.d.ts

@@ -17,6 +17,22 @@ declare type SmartAccessRoom = {
     roomNumber: string;
     path: string;
 };
+declare type SmartAccessRoomKey = {
+    deviceId: string;
+    deviceName: string;
+    keyList: {
+        keyId: string;
+        accessStartDate: string;
+        accessEndDate: string;
+        pinCode: string;
+        userType: string;
+        keyType: string;
+        allowDayofWeek: string;
+        allowTime: string;
+        issuedDate: string;
+        issuedStatus: 'SCHEDULED' | 'COMPLETED' | 'CANCELED' | 'FAILED';
+    }[];
+};
 export default class SmartAccessAdapter {
     static indexAccommodation: ({ accommodationId, }: {
         accommodationId: string;
@@ -53,6 +69,9 @@ export default class SmartAccessAdapter {
     }) => Promise<SmartAccessRoom>;
     getRooms: (accommodationId: string) => Promise<SmartAccessRoom[]>;
     getDevices: (accommodationId: string) => Promise<any>;
+    getRoomsKey: (accommodationId: string, roomId: string) => Promise<{
+        lockList: SmartAccessRoomKey[];
+    }>;
     getRoomsWithDevices: (accommodationId: string) => Promise<SmartAccessRoom[]>;
     createPinCodeForRoom: ({ roomId, accommodationId, userType, keyType, startDate, endDate, }: {
         roomId: string;

package/lib/adapters/smartAccess.js

@@ -231,6 +231,21 @@ var SmartAccessAdapter = /** @class */ (function () {
                 }
             });
         }); };
+        this.getRoomsKey = function (accommodationId, roomId) { return __awaiter(_this, void 0, void 0, function () {
+            var roomKeyResponse;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.callSmartAccessApi({
+                            accommodationId: accommodationId,
+                            method: 'get',
+                            route: "v1/room/" + roomId + "/keyinfo",
+                        })];
+                    case 1:
+                        roomKeyResponse = _a.sent();
+                        return [2 /*return*/, roomKeyResponse];
+                }
+            });
+        }); };
         this.getRoomsWithDevices = function (accommodationId) { return __awaiter(_this, void 0, void 0, function () {
             var rooms, devices, devicesRoomIdMap, roomsWithDevices;
             return __generator(this, function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendit-dev/thirdparty-adapters",
-  "version": "0.4.0-beta.9",
+  "version": "0.4.1-beta.1",
   "description": "Third party adapters between v-cloud and other PMS/CMS providers.",
   "main": "lib/index.js",
   "scripts": {