@aldb2b/common 1.0.16 → 1.0.20

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.
@@ -2,6 +2,7 @@ import { QueryOptions } from 'mongoose';
2
2
  import { CustomModel } from './CustomModel';
3
3
  import { ReadResult } from '../types/read-result.interface';
4
4
  import { UpdateInputData } from '../types/update-input-data.interface';
5
+ import { MongooseFindOptions } from './mongoose-find-options';
5
6
  export declare class MongooseBase<T> {
6
7
  private dbModelInstance;
7
8
  private projectionOnCreateResult;
@@ -11,9 +12,9 @@ export declare class MongooseBase<T> {
11
12
  createRaw(recordObj: any): Promise<any>;
12
13
  createMany(createArr: any): Promise<object>;
13
14
  private getProjectedCreatedItem;
14
- unlimitedRead(inputParams: any): Promise<ReadResult>;
15
- read(inputParams: any): Promise<ReadResult>;
16
- readBase(queryOptions: QueryOptions, inputParams: any): Promise<ReadResult>;
15
+ unlimitedRead(inputParams: MongooseFindOptions): Promise<ReadResult>;
16
+ read(inputParams: MongooseFindOptions): Promise<ReadResult>;
17
+ readBase(queryOptions: QueryOptions, inputParams: MongooseFindOptions): Promise<ReadResult>;
17
18
  private getQueryOptions;
18
19
  private getFinalQuery;
19
20
  private getTotalCount;
@@ -26,4 +27,7 @@ export declare class MongooseBase<T> {
26
27
  private setDataToUpdate;
27
28
  findOneAndUpdate(inputParams: UpdateInputData): Promise<T>;
28
29
  findOneAndUpdateRaw(inputParams: UpdateInputData): Promise<T>;
30
+ deleteWithQuery(deleteQuery: any): Promise<any>;
31
+ deleteMany(idList: string[]): Promise<any>;
32
+ deleteOne(id: string): Promise<any>;
29
33
  }
@@ -13,7 +13,7 @@ class MongooseBase {
13
13
  try {
14
14
  const validatedNewItem = await this.dbModelInstance.validateNewItem(recordObj);
15
15
  const createdItem = await this.dbModelInstance.create(validatedNewItem);
16
- const pruningCreatedItem = this.getProjectedCreatedItem(createdItem, recordObj);
16
+ const pruningCreatedItem = this.getProjectedCreatedItem(createdItem.toObject(), recordObj);
17
17
  return pruningCreatedItem;
18
18
  }
19
19
  catch (err) {
@@ -104,7 +104,7 @@ class MongooseBase {
104
104
  queryOptions.sort = inputParams.sort;
105
105
  }
106
106
  if (inputParams.limit) {
107
- queryOptions.limit = parseInt(inputParams.limit);
107
+ queryOptions.limit = Number(inputParams.limit);
108
108
  }
109
109
  else {
110
110
  queryOptions.limit = 100;
@@ -113,7 +113,7 @@ class MongooseBase {
113
113
  queryOptions.lean = true;
114
114
  }
115
115
  if (inputParams.skip) {
116
- queryOptions.skip = parseInt(inputParams.skip);
116
+ queryOptions.skip = Number(inputParams.skip);
117
117
  }
118
118
  return queryOptions;
119
119
  }
@@ -204,12 +204,50 @@ class MongooseBase {
204
204
  });
205
205
  }
206
206
  async findOneAndUpdateRaw(inputParams) {
207
- const data = this.setDataToUpdate(inputParams, inputParams);
207
+ const data = this.setDataToUpdate(inputParams, inputParams.data);
208
208
  return this.dbModelInstance.findOneAndUpdate(inputParams.query, data, {
209
209
  new: true,
210
210
  lean: true,
211
211
  });
212
212
  }
213
+ async deleteWithQuery(deleteQuery) {
214
+ try {
215
+ const deleteResult = await this.dbModelInstance.deleteMany(deleteQuery);
216
+ if (deleteResult.deletedCount > 0 && deleteResult.ok) {
217
+ return deleteResult.deletedCount;
218
+ }
219
+ throw new common_1.BadRequestException('Invalid id list');
220
+ }
221
+ catch (err) {
222
+ throw err;
223
+ }
224
+ }
225
+ async deleteMany(idList) {
226
+ try {
227
+ const deleteQuery = { _id: idList };
228
+ const deleteResult = await this.dbModelInstance.deleteMany(deleteQuery);
229
+ if (deleteResult.deletedCount > 0 && deleteResult.ok) {
230
+ return deleteResult.deletedCount;
231
+ }
232
+ throw new common_1.BadRequestException('Invalid id list');
233
+ }
234
+ catch (err) {
235
+ throw err;
236
+ }
237
+ }
238
+ async deleteOne(id) {
239
+ try {
240
+ const deleteQuery = { _id: id };
241
+ const deleteResult = await this.dbModelInstance.deleteOne(deleteQuery);
242
+ if (deleteResult.deletedCount > 0) {
243
+ return deleteResult.deletedCount;
244
+ }
245
+ throw new common_1.BadRequestException('Invalid id');
246
+ }
247
+ catch (err) {
248
+ throw err;
249
+ }
250
+ }
213
251
  }
214
252
  exports.MongooseBase = MongooseBase;
215
253
  //# sourceMappingURL=MongooseBase.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MongooseBase.js","sourceRoot":"","sources":["../../src/db/MongooseBase.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AAErD,oDAAiD;AAKjD,MAAa,YAAY;IAKvB,YAAY,eAA+B;QAHnC,6BAAwB,GAAG,IAAI,CAAC;QAChC,6BAAwB,GAAG,IAAI,CAAC;QAGtC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAS;QACpB,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CACjE,SAAS,CACV,CAAC;YAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAExE,MAAM,kBAAkB,GAAG,IAAI,CAAC,uBAAuB,CACrD,WAAW,EACX,SAAS,CACV,CAAC;YACF,OAAO,kBAAkB,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,SAAS;QACvB,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACrD;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAS;QACxB,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACrE,IAAI,WAAW,EAAE;gBACf,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,OAAO;wBACL,OAAO,EAAE,WAAW;wBACpB,MAAM,EAAE,WAAW,CAAC,MAAM;qBAC3B,CAAC;iBACH;qBAAM;oBACL,MAAM,IAAI,4BAAmB,CAAC,iBAAiB,CAAC,CAAC;iBAClD;aACF;iBAAM;gBACL,MAAM,IAAI,4BAAmB,CAAC,iBAAiB,CAAC,CAAC;aAClD;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAEO,uBAAuB,CAAC,WAAW,EAAE,SAAS;QACpD,IAAI,kBAAkB,GAAG,IAAI,CAAC,wBAAwB;YACpD,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,WAAW,CAAC;YAC5D,CAAC,CAAC,WAAW,CAAC;QAChB,IACE,SAAS,CAAC,wBAAwB;YAClC,SAAS,CAAC,wBAAwB,CAAC,MAAM,EACzC;YACA,kBAAkB,GAAG,uBAAU,CAC7B,SAAS,CAAC,wBAAwB,EAClC,kBAAkB,CACnB,CAAC;SACH;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAW;QAC7B,IAAI;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;YACvD,YAAY,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACnE,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;SACvD;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,WAAW;QACpB,IAAI;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;YACvD,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;SACvD;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,YAA0B,EAAE,WAAW;QACpD,MAAM,MAAM,mCAAoB,YAAY,KAAE,QAAQ,EAAE,KAAK,GAAE,CAAC;QAChE,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK;YAClC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC;YACvC,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CACjE,WAAW,CAAC,wBAAwB,CACrC,CAAC;QAEF,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,MAAM,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SACrD;QAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE;YACvC,MAAM,SAAS,GAAG,EAAE,UAAU,EAAE,mBAAmB,EAAE,YAAY,EAAE,CAAC;YACpE,MAAM,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;SAC1E;aAAM;YACL,MAAM,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAC3C,UAAU,EACV,mBAAmB,EACnB,YAAY,CACb,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,eAAe,CAAC,WAAW;QACjC,MAAM,YAAY,GAAiB,EAAE,CAAC;QACtC,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE;YACzC,YAAY,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;SACtC;QAED,IAAI,WAAW,CAAC,KAAK,EAAE;YACrB,YAAY,CAAC,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACL,YAAY,CAAC,KAAK,GAAG,GAAG,CAAC;SAC1B;QAED,IAAI,WAAW,CAAC,IAAI,EAAE;YACpB,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;SAC1B;QAED,IAAI,WAAW,CAAC,IAAI,EAAE;YACpB,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAChD;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,aAAa,CAAC,KAAK;QACzB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAK;QAC/B,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAEO,iBAAiB,CAAC,WAAW;QACnC,OAAO,CAAC,CAAC,CACP,WAAW,CAAC,YAAY;YACxB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;YACpC,WAAW,CAAC,SAAS,CAAC,MAAM,CAC7B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS;QAC1D,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEzE,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAC1C,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,mBAAmB,EAC7B,SAAS,CAAC,YAAY,CACvB,CAAC;QAEF,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC7C,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,YAAY,CAAC;IAC5B,CAAC;IAEO,oBAAoB,CAAC,SAAS;QACpC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,IAAI;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACzB;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,IAAI,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS;QACxC,IAAI;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;gBAChD,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;aACzE;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;gBACnD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;aACnE;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACnC,KAAK,EACL,UAAU,EACV,SAAS;QAET,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC5D,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACtC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,YAAY,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,WAA4B;QACvC,IAAI;YACF,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CACvE,WAAW,CAAC,IAAI,CACjB,CAAC;YAEF,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;YACpE,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAEO,eAAe,CAAC,WAAW,EAAE,mBAAmB;QACtD,MAAM,IAAI,GAAoB,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9B,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;SACjC;QACD,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxC;QACD,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,WAA4B;QACjD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CACvE,WAAW,CAAC,IAAI,CACjB,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE;YACpE,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,WAA4B;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE;YACpE,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;CACF;AAlQD,oCAkQC"}
1
+ {"version":3,"file":"MongooseBase.js","sourceRoot":"","sources":["../../src/db/MongooseBase.ts"],"names":[],"mappings":"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"}
@@ -3016,11 +3016,6 @@
3016
3016
  "signature": "bc3851d9fcd62807b2039d04fb0bce553cf15a9ca3a56b28cbdd253d2f7b6ff0",
3017
3017
  "affectsGlobalScope": false
3018
3018
  },
3019
- "../src/db/MongooseBase.ts": {
3020
- "version": "c5ef18d366ceec8d4a0f18c3053a78f9197ae881d1e7702b42aee5964fca71bf",
3021
- "signature": "c6d22e023d901ebb571c416a45263f2acfbcb544bd85c5a76e2fdf055ee78e9f",
3022
- "affectsGlobalScope": false
3023
- },
3024
3019
  "../node_modules/@nestjs/swagger/dist/decorators/api-basic.decorator.d.ts": {
3025
3020
  "version": "6ecc423e71318bafbd230e6059e082c377170dfc7e02fccfa600586f8604d452",
3026
3021
  "signature": "6ecc423e71318bafbd230e6059e082c377170dfc7e02fccfa600586f8604d452",
@@ -3216,6 +3211,11 @@
3216
3211
  "signature": "39409bbf0717d3495ad611f8994cee532d60e52bb5bbf3349e50bec723222b95",
3217
3212
  "affectsGlobalScope": false
3218
3213
  },
3214
+ "../src/db/MongooseBase.ts": {
3215
+ "version": "b6ccc220b73af34e6c9269c3e039ff9499477e5459415a7ca8ab811198aadefd",
3216
+ "signature": "3b7e6bfdc2df5408a1074e8714a2270df84237cf3121765b17caf702afc27939",
3217
+ "affectsGlobalScope": false
3218
+ },
3219
3219
  "../src/types/user-role.enum.ts": {
3220
3220
  "version": "dbad9cb0d1d09586d8b33b76fd2d78f24d5d14c07d33b85d22e8a05def7b2596",
3221
3221
  "signature": "4adddacba07630c780f464408c48aede0499e8a1ca3d7e5af5a7a6a81c9f6e63",
@@ -5750,6 +5750,7 @@
5750
5750
  "../node_modules/@nestjs/common/index.d.ts",
5751
5751
  "../node_modules/mongoose/index.d.ts",
5752
5752
  "../src/db/CustomModel.ts",
5753
+ "../src/db/mongoose-find-options.ts",
5753
5754
  "../src/types/read-result.interface.ts",
5754
5755
  "../src/types/update-input-data.interface.ts",
5755
5756
  "../src/utils/projection.ts"
@@ -8251,6 +8252,7 @@
8251
8252
  "../src/db/MongooseBase.ts": [
8252
8253
  "../node_modules/mongoose/index.d.ts",
8253
8254
  "../src/db/CustomModel.ts",
8255
+ "../src/db/mongoose-find-options.ts",
8254
8256
  "../src/types/read-result.interface.ts",
8255
8257
  "../src/types/update-input-data.interface.ts"
8256
8258
  ],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aldb2b/common",
3
- "version": "1.0.16",
3
+ "version": "1.0.20",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",