@sdflc/backend-helpers 1.0.41 → 1.0.42

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.
@@ -38,6 +38,6 @@ declare class BaseGateway {
38
38
  * @returns Array of updated or inserted objects
39
39
  */
40
40
  set(params: any): Promise<any[]>;
41
- remove(where: any, hardRemove?: boolean): Promise<any>;
41
+ remove(where: any): Promise<any>;
42
42
  }
43
43
  export { BaseGateway };
@@ -143,10 +143,11 @@ var BaseGateway = /** @class */ (function () {
143
143
  BaseGateway.prototype.onRemoveFilter = function (query, filterParams) {
144
144
  return __awaiter(this, void 0, void 0, function () {
145
145
  var hasStatus, arr;
146
+ var _this = this;
146
147
  return __generator(this, function (_a) {
147
148
  hasStatus = this.config.hasStatus;
148
149
  arr = (0, lodash_1.castArray)(filterParams);
149
- query = query.whereIn(constants_1.FIELDS.ID, arr.map(function (item) { return item[constants_1.FIELDS.ID]; }));
150
+ query = query.whereIn(this.getIdField(), arr.map(function (item) { return item[_this.getIdField()]; }));
150
151
  if (hasStatus === true) {
151
152
  query.where(constants_1.FIELDS.STATUS, '!=', utils_1.STATUSES.REMOVED);
152
153
  }
@@ -174,7 +175,7 @@ var BaseGateway = /** @class */ (function () {
174
175
  params[constants_1.FIELDS.VERSION] = 0;
175
176
  }
176
177
  if (hasLang && localizationForField) {
177
- params[this.getIdField()] = (0, utils_1.buildKey)([params[localizationForField], params[constants_1.FIELDS.LANG]]);
178
+ params[this.getIdField()] = (0, utils_1.buildKey)([params[(0, lodash_1.camelCase)(localizationForField)], params[(0, lodash_1.camelCase)(constants_1.FIELDS.LANG)]]);
178
179
  }
179
180
  return [2 /*return*/, params];
180
181
  });
@@ -200,7 +201,7 @@ var BaseGateway = /** @class */ (function () {
200
201
  }
201
202
  }
202
203
  if (hasLang && localizationForField) {
203
- params[this.getIdField()] = (0, utils_1.buildKey)([params[localizationForField], params[constants_1.FIELDS.LANG]]);
204
+ params[this.getIdField()] = (0, utils_1.buildKey)([params[(0, lodash_1.camelCase)(localizationForField)], params[(0, lodash_1.camelCase)(constants_1.FIELDS.LANG)]]);
204
205
  }
205
206
  return [2 /*return*/, params];
206
207
  });
@@ -208,9 +209,20 @@ var BaseGateway = /** @class */ (function () {
208
209
  };
209
210
  BaseGateway.prototype.transformOnSet = function (params) {
210
211
  return __awaiter(this, void 0, void 0, function () {
211
- var _a, hasUpdatedAt, hasUpdatedBy, hasVersion, hasLang, localizationForField;
212
+ var _a, hasCreatedAt, hasCreatedBy, hasSpace, hasUpdatedAt, hasUpdatedBy, hasVersion, hasLang, localizationForField;
212
213
  return __generator(this, function (_b) {
213
- _a = this.config, hasUpdatedAt = _a.hasUpdatedAt, hasUpdatedBy = _a.hasUpdatedBy, hasVersion = _a.hasVersion, hasLang = _a.hasLang, localizationForField = _a.localizationForField;
214
+ _a = this.config, hasCreatedAt = _a.hasCreatedAt, hasCreatedBy = _a.hasCreatedBy, hasSpace = _a.hasSpace, hasUpdatedAt = _a.hasUpdatedAt, hasUpdatedBy = _a.hasUpdatedBy, hasVersion = _a.hasVersion, hasLang = _a.hasLang, localizationForField = _a.localizationForField;
215
+ if (hasCreatedAt) {
216
+ params[constants_1.FIELDS.CREATED_AT] = this.dateTime.dbFormat(this.dateTimeNow);
217
+ }
218
+ if (hasCreatedBy) {
219
+ if (params[constants_1.FIELDS.CREATED_BY] === undefined) {
220
+ params[constants_1.FIELDS.CREATED_BY] = this.getContext().userId;
221
+ }
222
+ }
223
+ if (hasSpace) {
224
+ params[constants_1.FIELDS.SPACE_ID] = this.getContext().spaceId;
225
+ }
214
226
  if (hasUpdatedAt) {
215
227
  params[constants_1.FIELDS.UPDATED_AT] = this.dateTime.dbFormat(this.dateTimeNow);
216
228
  }
@@ -223,9 +235,12 @@ var BaseGateway = /** @class */ (function () {
223
235
  if (params[constants_1.FIELDS.VERSION] != null && !isNaN(params[constants_1.FIELDS.VERSION])) {
224
236
  params[constants_1.FIELDS.VERSION] = params[constants_1.FIELDS.VERSION] + 1;
225
237
  }
238
+ else {
239
+ params[constants_1.FIELDS.VERSION] = 0;
240
+ }
226
241
  }
227
242
  if (hasLang && localizationForField) {
228
- params[this.getIdField()] = (0, utils_1.buildKey)([params[localizationForField], params[constants_1.FIELDS.LANG]]);
243
+ params[this.getIdField()] = (0, utils_1.buildKey)([params[(0, lodash_1.camelCase)(localizationForField)], params[(0, lodash_1.camelCase)(constants_1.FIELDS.LANG)]]);
229
244
  }
230
245
  return [2 /*return*/, params];
231
246
  });
@@ -233,16 +248,17 @@ var BaseGateway = /** @class */ (function () {
233
248
  };
234
249
  BaseGateway.prototype.transformOnRemove = function (args) {
235
250
  return __awaiter(this, void 0, void 0, function () {
236
- var _a, hasRemovedAt, hasRemovedAtStr, hasStatus, hasRemovedBy, removalTime, obj;
251
+ var _a, hasRemovedAt, hasRemovedAtStr, hasStatus, hasRemovedBy, hasLang, localizationForField, removalTime, removalTimeStr, obj;
237
252
  return __generator(this, function (_b) {
238
- _a = this.config, hasRemovedAt = _a.hasRemovedAt, hasRemovedAtStr = _a.hasRemovedAtStr, hasStatus = _a.hasStatus, hasRemovedBy = _a.hasRemovedBy;
253
+ _a = this.config, hasRemovedAt = _a.hasRemovedAt, hasRemovedAtStr = _a.hasRemovedAtStr, hasStatus = _a.hasStatus, hasRemovedBy = _a.hasRemovedBy, hasLang = _a.hasLang, localizationForField = _a.localizationForField;
239
254
  removalTime = (0, dayjs_1.default)();
255
+ removalTimeStr = removalTime.format('YYYYMMDDTHHmmssZ');
240
256
  obj = __assign({}, (args || {}));
241
257
  if (hasRemovedAt) {
242
258
  obj[constants_1.FIELDS.REMOVED_AT] = removalTime.toDate();
243
259
  }
244
260
  if (hasRemovedAtStr === true) {
245
- obj[constants_1.FIELDS.REMOVED_AT_STR] = removalTime.format('YYYYMMDDTHHmmssZ');
261
+ obj[constants_1.FIELDS.REMOVED_AT_STR] = removalTimeStr;
246
262
  }
247
263
  if (hasStatus) {
248
264
  obj[constants_1.FIELDS.STATUS] = utils_1.STATUSES.REMOVED;
@@ -252,6 +268,9 @@ var BaseGateway = /** @class */ (function () {
252
268
  obj[constants_1.FIELDS.REMOVED_BY] = this.getContext().userId;
253
269
  }
254
270
  }
271
+ if (hasLang && localizationForField) {
272
+ obj[this.getIdField()] = this.getDb().raw("CONCAT(id, '-".concat(removalTimeStr, "')"));
273
+ }
255
274
  return [2 /*return*/, obj];
256
275
  });
257
276
  });
@@ -492,11 +511,11 @@ var BaseGateway = /** @class */ (function () {
492
511
  BaseGateway.prototype.set = function (params) {
493
512
  var _a;
494
513
  return __awaiter(this, void 0, void 0, function () {
495
- var _b, hasCreatedAt, hasCreatedBy, mergeFields, objects, skipFields, fields, idx, len, object, _c, _d, _e, _f, result, chunks, idx, len, items;
514
+ var _b, hasCreatedAt, hasCreatedBy, hasSpace, mergeFields, objects, skipFields, idx, len, object, _c, _d, _e, _f, fields, result, chunks, idx, len, items;
496
515
  return __generator(this, function (_g) {
497
516
  switch (_g.label) {
498
517
  case 0:
499
- _b = this.config || {}, hasCreatedAt = _b.hasCreatedAt, hasCreatedBy = _b.hasCreatedBy, mergeFields = _b.mergeFields;
518
+ _b = this.config || {}, hasCreatedAt = _b.hasCreatedAt, hasCreatedBy = _b.hasCreatedBy, hasSpace = _b.hasSpace, mergeFields = _b.mergeFields;
500
519
  objects = (0, lodash_1.castArray)(params);
501
520
  if (!params || objects.length === 0) {
502
521
  return [2 /*return*/, []];
@@ -508,7 +527,9 @@ var BaseGateway = /** @class */ (function () {
508
527
  if (hasCreatedBy) {
509
528
  skipFields.push(constants_1.FIELDS.CREATED_BY);
510
529
  }
511
- fields = Array.isArray(mergeFields) ? mergeFields : Object.keys(objects[0]);
530
+ if (hasSpace) {
531
+ skipFields.push(constants_1.FIELDS.SPACE_ID);
532
+ }
512
533
  idx = 0, len = objects.length;
513
534
  _g.label = 1;
514
535
  case 1:
@@ -519,7 +540,7 @@ var BaseGateway = /** @class */ (function () {
519
540
  return [4 /*yield*/, this.transformOnSet(object)];
520
541
  case 2:
521
542
  _c[_d] = _g.sent();
522
- if (!!objects[idx][this.getIdField()]) return [3 /*break*/, 4];
543
+ if (!(objects[idx][this.getIdField()] == null)) return [3 /*break*/, 4];
523
544
  _e = objects[idx];
524
545
  _f = this.getIdField();
525
546
  return [4 /*yield*/, this.generateId(object)];
@@ -530,6 +551,7 @@ var BaseGateway = /** @class */ (function () {
530
551
  ++idx;
531
552
  return [3 /*break*/, 1];
532
553
  case 5:
554
+ fields = Array.isArray(mergeFields) ? mergeFields : Object.keys(objects[0]);
533
555
  result = [];
534
556
  chunks = (0, utils_1.arrToChunks)(objects, ((_a = this.config) === null || _a === void 0 ? void 0 : _a.insertChunkSize) || DEFAULT_CHUNCK_SIZE);
535
557
  idx = 0, len = chunks.length;
@@ -540,7 +562,7 @@ var BaseGateway = /** @class */ (function () {
540
562
  .insert(chunks[idx])
541
563
  .returning(this.config.returnFields)
542
564
  .onConflict(this.config.setFields || this.getIdField())
543
- .merge((0, lodash_1.omit)(fields, skipFields))];
565
+ .merge((0, lodash_1.pullAll)(fields, skipFields))];
544
566
  case 7:
545
567
  items = _g.sent();
546
568
  result.push.apply(result, items);
@@ -553,30 +575,29 @@ var BaseGateway = /** @class */ (function () {
553
575
  });
554
576
  });
555
577
  };
556
- BaseGateway.prototype.remove = function (where, hardRemove) {
557
- if (hardRemove === void 0) { hardRemove = false; }
578
+ BaseGateway.prototype.remove = function (where) {
558
579
  return __awaiter(this, void 0, void 0, function () {
559
- var query, _a, _b, items;
580
+ var hardRemove, query, object, items;
560
581
  var _this = this;
561
- return __generator(this, function (_c) {
562
- switch (_c.label) {
582
+ return __generator(this, function (_a) {
583
+ switch (_a.label) {
563
584
  case 0:
585
+ hardRemove = (this.config || {}).hardRemove;
564
586
  query = this.getBuilder();
565
587
  if (!hardRemove) return [3 /*break*/, 1];
566
588
  query.delete(this.config.returnFields);
567
589
  return [3 /*break*/, 3];
568
- case 1:
569
- _b = (_a = query).update;
570
- return [4 /*yield*/, this.transformOnRemove()];
590
+ case 1: return [4 /*yield*/, this.transformOnRemove()];
571
591
  case 2:
572
- _b.apply(_a, [_c.sent()]).returning(this.config.returnFields);
573
- _c.label = 3;
592
+ object = _a.sent();
593
+ query.update(object).returning(this.config.returnFields);
594
+ _a.label = 3;
574
595
  case 3: return [4 /*yield*/, this.onRemoveFilter(query, where)];
575
596
  case 4:
576
- _c.sent();
597
+ _a.sent();
577
598
  return [4 /*yield*/, query];
578
599
  case 5:
579
- items = _c.sent();
600
+ items = _a.sent();
580
601
  if (items.length > 0 && this.config.noCache !== true) {
581
602
  items.forEach(function (item) { return _this.loader.clear(item[_this.getIdField()]); });
582
603
  }
@@ -9,7 +9,7 @@ declare class Database {
9
9
  createTransaction(trx: any): Promise<unknown>;
10
10
  getSchema(): string;
11
11
  getBuilder(arg: any): any;
12
- raw(query: string, bindings: any): any;
12
+ raw(query: string, bindings?: any): any;
13
13
  runRawQuery(query: string, bindings: any): Promise<any>;
14
14
  startTransaction(): Promise<unknown>;
15
15
  setTransaction(trx: any): void;
@@ -6,7 +6,7 @@ import { SortItemInterface } from './SortItemInterface';
6
6
  export interface BaseGatewayPropsInterface extends CacheInterface {
7
7
  context: ApiContext;
8
8
  setFields?: string[] | string;
9
- mergeFields: string[];
9
+ mergeFields?: string[];
10
10
  hasStatus?: boolean;
11
11
  hasCreatedBy?: boolean;
12
12
  hasUpdatedBy?: boolean;
@@ -18,10 +18,11 @@ export interface BaseGatewayPropsInterface extends CacheInterface {
18
18
  hasSpace?: boolean;
19
19
  hasVersion?: boolean;
20
20
  hasLang?: boolean;
21
- localizationForField: string;
21
+ localizationForField?: string;
22
22
  defaultSorting?: SortItemInterface[];
23
23
  fieldForKeyword?: string;
24
24
  insertChunkSize?: number;
25
+ hardRemove?: boolean;
25
26
  loader?: LoaderInterface;
26
27
  noCache?: boolean;
27
28
  returnFields?: any[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sdflc/backend-helpers",
3
- "version": "1.0.41",
3
+ "version": "1.0.42",
4
4
  "description": "Set of helper functions and classes to simplify building backend apps within @sdflc ecosystem",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",