@vendit-dev/thirdparty-adapters 0.4.0-beta.8 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/.github/PULL_REQUEST_TEMPLATE.md +16 -0
  2. package/lib/adapters/amanoKorea.js +41 -45
  3. package/package.json +1 -1
package/.github/PULL_REQUEST_TEMPLATE.md ADDED
@@ -0,0 +1,16 @@
1
+ ## PR 개요
2
+
3
+ - Jira Ticket: VENDIT-
4
+ - Notion Ticket link:
5
+ - 요약:
6
+ - 예상 PR 소요시간:
7
+ - 요청 리뷰어:
8
+ - 요청 PR Due Date:
9
+
10
+ ## 변경사항 상세
11
+
12
+ -
13
+
14
+ ## References
15
+
16
+ - 참고 문서, 스크린샷, 기타 자료 등등...
package/lib/adapters/amanoKorea.js CHANGED
@@ -84,75 +84,69 @@ var AmanoKoreaAdapter = /** @class */ (function () {
84
84
  this.getAccommodationAuthInfo = function (_a) {
85
85
  var accommodationId = _a.accommodationId;
86
86
  return __awaiter(_this, void 0, void 0, function () {
87
- var existingAuth, parsedCredential, lockId, lockHash, parsedCredential_1, newAuth, parsedCredential, err_1;
88
- return __generator(this, function (_b) {
89
- switch (_b.label) {
87
+ var existingAuth, parsedCredential, _b, authorization, apiHost, lotAreaNo, discCodeNo, lockId, lockHash, newAuth, parsedCredential, err_1;
88
+ return __generator(this, function (_c) {
89
+ switch (_c.label) {
90
90
  case 0: return [4 /*yield*/, this.redis.get(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }))];
91
91
  case 1:
92
- existingAuth = _b.sent();
93
- console.log('🚀 ~ file: amanoKorea.ts:113 ~ AmanoKoreaAdapter ~ existingAuth:', existingAuth);
92
+ existingAuth = _c.sent();
94
93
  if (existingAuth) {
95
94
  parsedCredential = this.parseJSONSafe(existingAuth);
96
- console.log('🚀 ~ file: amanoKorea.ts:111 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential);
97
- if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.authorization) {
98
- this.setAuthorization(parsedCredential.authorization);
99
- this.API_HOST = parsedCredential.apiHost;
95
+ if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.credential) {
96
+ _b = this.parseJSONSafe(parsedCredential.credential), authorization = _b.authorization, apiHost = _b.apiHost, lotAreaNo = _b.lotAreaNo, discCodeNo = _b.discCodeNo;
97
+ this.setAuthorization({
98
+ authorization: authorization,
99
+ });
100
+ this.lotAreaNo = lotAreaNo;
101
+ this.discCodeNo = discCodeNo;
102
+ this.API_HOST = apiHost;
100
103
  }
101
104
  return [2 /*return*/, this.parseJSONSafe(existingAuth)];
102
105
  }
103
106
  lockId = "AMANO-HKEY|" + accommodationId;
104
107
  return [4 /*yield*/, this.mutexLock.getMutexLock(lockId)];
105
108
  case 2:
106
- lockHash = _b.sent();
107
- return [4 /*yield*/, this.redis.get(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }))];
109
+ lockHash = _c.sent();
110
+ _c.label = 3;
108
111
  case 3:
109
- existingAuth = _b.sent();
110
- _b.label = 4;
111
- case 4:
112
- _b.trys.push([4, 9, 10, 12]);
113
- if (existingAuth) {
114
- parsedCredential_1 = this.parseJSONSafe(existingAuth);
115
- console.log('🚀 ~ file: amanoKorea.ts:124 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential_1);
116
- if (parsedCredential_1 === null || parsedCredential_1 === void 0 ? void 0 : parsedCredential_1.authorization) {
117
- this.setAuthorization(parsedCredential_1.authorization);
118
- this.API_HOST = parsedCredential_1.apiHost;
119
- }
120
- return [2 /*return*/, this.parseJSONSafe(existingAuth)];
121
- }
112
+ _c.trys.push([3, 8, 9, 11]);
122
113
  return [4 /*yield*/, this.authenticator.getThirdPartyCredential({
123
114
  accommodationId: accommodationId,
124
115
  provider: this.PROVIDER_KEY,
125
116
  })];
126
- case 5:
127
- newAuth = _b.sent();
128
- if (!(!newAuth || !(newAuth === null || newAuth === void 0 ? void 0 : newAuth.credential))) return [3 /*break*/, 7];
117
+ case 4:
118
+ newAuth = _c.sent();
119
+ if (!(!newAuth || !(newAuth === null || newAuth === void 0 ? void 0 : newAuth.credential))) return [3 /*break*/, 6];
129
120
  return [4 /*yield*/, this.redis.set(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }), 'NOT_FOUND', 'EX', 60 * 5)];
130
- case 6:
131
- _b.sent();
121
+ case 5:
122
+ _c.sent();
132
123
  return [2 /*return*/, false];
133
- case 7:
124
+ case 6:
134
125
  parsedCredential = this.parseJSONSafe(newAuth.credential);
135
- console.log('🚀 ~ file: amanoKorea.ts:151 ~ AmanoKoreaAdapter ~ parsedCredential:', parsedCredential);
136
126
  if (parsedCredential === null || parsedCredential === void 0 ? void 0 : parsedCredential.authorization) {
137
- this.setAuthorization(parsedCredential.authorization);
127
+ this.setAuthorization({
128
+ authorization: parsedCredential.authorization,
129
+ });
130
+ this.lotAreaNo = parsedCredential.lotAreaNo;
131
+ this.discCodeNo = parsedCredential.discCodeNo;
138
132
  this.API_HOST = parsedCredential.apiHost;
139
133
  }
140
134
  else {
141
135
  throw new Error('Authorization is not found');
142
136
  }
143
137
  return [4 /*yield*/, this.redis.set(AmanoKoreaAdapter.indexAccommodation({ accommodationId: accommodationId }), JSON.stringify(newAuth), 'EX', 60 * 5)];
144
- case 8:
145
- _b.sent();
138
+ case 7:
139
+ _c.sent();
146
140
  return [2 /*return*/, parsedCredential];
147
- case 9:
148
- err_1 = _b.sent();
141
+ case 8:
142
+ err_1 = _c.sent();
149
143
  console.log(err_1);
150
144
  throw err_1;
151
- case 10: return [4 /*yield*/, this.mutexLock.unlockMutexLock(lockId, lockHash)];
152
- case 11:
153
- _b.sent();
145
+ case 9: return [4 /*yield*/, this.mutexLock.unlockMutexLock(lockId, lockHash)];
146
+ case 10:
147
+ _c.sent();
154
148
  return [7 /*endfinally*/];
155
- case 12: return [2 /*return*/];
149
+ case 11: return [2 /*return*/];
156
150
  }
157
151
  });
158
152
  });
@@ -164,7 +158,7 @@ var AmanoKoreaAdapter = /** @class */ (function () {
164
158
  this.callAPI = function (_a) {
165
159
  var directory = _a.directory, resources = _a.resources;
166
160
  return __awaiter(_this, void 0, void 0, function () {
167
- var fetchResult, fetchResultJson, data, err_2;
161
+ var fetchResult, fetchResultJson, err_2;
168
162
  return __generator(this, function (_b) {
169
163
  switch (_b.label) {
170
164
  case 0:
@@ -186,8 +180,7 @@ var AmanoKoreaAdapter = /** @class */ (function () {
186
180
  return [4 /*yield*/, (fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.json())];
187
181
  case 3:
188
182
  fetchResultJson = _b.sent();
189
- data = fetchResultJson.data;
190
- return [2 /*return*/, data];
183
+ return [2 /*return*/, fetchResultJson];
191
184
  case 4:
192
185
  err_2 = _b.sent();
193
186
  console.error('err', err_2);
@@ -214,10 +207,13 @@ var AmanoKoreaAdapter = /** @class */ (function () {
214
207
  // };
215
208
  // 방문차량 등록 내역 조회
216
209
  this.getPreDiscountListInfo = function (resources) { return __awaiter(_this, void 0, void 0, function () {
217
- return __generator(this, function (_a) {
210
+ var _a, lotAreaNo, discCodeNo;
211
+ return __generator(this, function (_b) {
212
+ _a = this, lotAreaNo = _a.lotAreaNo, discCodeNo = _a.discCodeNo;
218
213
  return [2 /*return*/, this.callAPI({
219
214
  directory: 'getPreDiscountListInfo.do',
220
- resources: resources,
215
+ resources: __assign(__assign({}, resources), { lotAreaNo: lotAreaNo,
216
+ discCodeNo: discCodeNo }),
221
217
  })];
222
218
  });
223
219
  }); };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vendit-dev/thirdparty-adapters",
3
- "version": "0.4.0-beta.8",
3
+ "version": "0.4.0",
4
4
  "description": "Third party adapters between v-cloud and other PMS/CMS providers.",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {