@opra/mongodb 0.32.6 → 0.33.1

package/cjs/mongo-singleton-service.js

@@ -30,11 +30,11 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * Asserts the existence of a resource based on the given options.
      *
      * @returns {Promise<void>} A Promise that resolves when the resource exists.
-     * @throws {ResourceNotFoundError} If the resource does not exist.
+     * @throws {ResourceNotAvailableError} If the resource does not exist.
      */
     async assert(options) {
         if (!(await this.exists(options)))
-            throw new common_1.ResourceNotFoundError(this.getResourceName());
+            throw new common_1.ResourceNotAvailableError(this.getResourceName());
     }
     /**
      * Creates the document in the database.
@@ -45,13 +45,15 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @throws {Error} Throws an error if an unknown error occurs while creating the document.
      */
     async create(input, options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.create(input, { ...options, __interceptor__: true }), {
-                crud: 'create',
-                method: 'create',
-                input,
-                options,
-            }, this);
+        const info = {
+            crud: 'create',
+            method: 'create',
+            input,
+            options,
+        };
+        return this._intercept(() => this._create(input, options), info);
+    }
+    async _create(input, options) {
         const encode = this.getEncoder('create');
         const doc = encode(input);
         doc._id = this._id;
@@ -59,16 +61,14 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
         if (r.insertedId) {
             if (!options)
                 return doc;
-            try {
-                return this.get(options);
-            }
-            catch (e) {
-                Error.captureStackTrace(e);
-                throw e;
-            }
+            const out = await this._findOne(options);
+            if (out)
+                return out;
+            if (!out)
+                throw new common_1.ResourceNotAvailableError(this.getResourceName());
         }
         /* istanbul ignore next */
-        throw new Error('Unknown error while creating document');
+        throw new common_1.InternalServerError(`Unknown error while creating document for "${this.getResourceName()}"`);
     }
     /**
      * Deletes a record from the database
@@ -77,15 +77,22 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @returns {Promise<number>} The number of records deleted
      */
     async delete(options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.delete({ ...options, __interceptor__: true }), {
-                crud: 'delete',
-                method: 'delete',
-                options,
-            }, this);
+        const info = {
+            crud: 'delete',
+            method: 'delete',
+            options,
+        };
+        return this._intercept(async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(info),
+                options?.filter
+            ]);
+            return this._delete({ ...options, filter });
+        }, info);
+    }
+    async _delete(options) {
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             { _id: this._id },
-            await this._getDocumentFilter(),
             options?.filter
         ]);
         const r = await this.__deleteOne(filter, options);
@@ -97,13 +104,7 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @return {Promise<boolean>} - A promise that resolves to a boolean value indicating if the document exists.
      */
     async exists(options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.exists({ ...options, __interceptor__: true }), {
-                crud: 'read',
-                method: 'exists',
-                options,
-            }, this);
-        return !!(await this.findOne({ ...options, pick: ['_id'] }));
+        return !!(await this.findOne({ ...options, pick: ['_id'], omit: undefined, include: undefined }));
     }
     /**
      * Fetches the document if it exists. Returns undefined if not found.
@@ -112,15 +113,22 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @returns {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the found document or undefined if not found.
      */
     async findOne(options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.findOne({ ...options, __interceptor__: true }), {
-                crud: 'read',
-                method: 'find',
-                options,
-            }, this);
+        const info = {
+            crud: 'read',
+            method: 'findOne',
+            options,
+        };
+        return this._intercept(async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(info),
+                options?.filter
+            ]);
+            return this._findOne({ ...options, filter });
+        }, info);
+    }
+    async _findOne(options) {
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             { _id: this._id },
-            await this._getDocumentFilter(),
             options?.filter
         ]);
         const mongoOptions = {
@@ -139,12 +147,12 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      *
      * @param {MongoCollectionService.FindOneOptions} options - The options to customize the query.
      * @return {Promise<PartialDTO<T>>} - A promise that resolves to the fetched document.
-     * @throws {ResourceNotFoundError} - If the document is not found in the collection.
+     * @throws {ResourceNotAvailableError} - If the document is not found in the collection.
      */
     async get(options) {
         const out = await this.findOne(options);
         if (!out)
-            throw new common_1.ResourceNotFoundError(this.getResourceName());
+            throw new common_1.ResourceNotAvailableError(this.getResourceName());
         return out;
     }
     /**
@@ -156,13 +164,21 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @return {Promise<number>} - A promise that resolves to the updated document or undefined if not found.
      */
     async updateOnly(input, options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.updateOnly(input, { ...options, __interceptor__: true }), {
-                crud: 'update',
-                method: 'update',
-                input,
-                options,
-            }, this);
+        const info = {
+            crud: 'update',
+            method: 'update',
+            input,
+            options,
+        };
+        return this._intercept(async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(info),
+                options?.filter
+            ]);
+            return this._updateOnly(input, { ...options, filter });
+        }, info);
+    }
+    async _updateOnly(input, options) {
         const encode = this.getEncoder('update');
         const doc = encode(input);
         const patch = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
@@ -174,7 +190,6 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
         };
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             { _id: this._id },
-            await this._getDocumentFilter(),
             options?.filter
         ]);
         const r = await this.__updateOne(filter, patch, mongoOptions);
@@ -189,13 +204,21 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @return {Promise<PartialDTO<T> | undefined>} - A promise that resolves to the updated document or undefined if not found.
      */
     async update(input, options) {
-        if (this.$interceptor && !options?.__interceptor__)
-            return this.$interceptor(() => this.update(input, { ...options, __interceptor__: true }), {
-                crud: 'update',
-                method: 'update',
-                input,
-                options,
-            }, this);
+        const info = {
+            crud: 'update',
+            method: 'update',
+            input,
+            options,
+        };
+        return this._intercept(async () => {
+            const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
+                await this._getDocumentFilter(info),
+                options?.filter
+            ]);
+            return this._update(input, { ...options, filter });
+        }, info);
+    }
+    async _update(input, options) {
         const encode = this.getEncoder('update');
         const doc = encode(input);
         const patch = mongo_adapter_js_1.MongoAdapter.preparePatch(doc);
@@ -207,7 +230,6 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
         };
         const filter = mongo_adapter_js_1.MongoAdapter.prepareFilter([
             { _id: this._id },
-            await this._getDocumentFilter(),
             options?.filter
         ]);
         const decoder = this.getDecoder();
@@ -222,9 +244,14 @@ class MongoSingletonService extends mongo_service_js_1.MongoService {
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    _getDocumentFilter() {
+    _getDocumentFilter(args) {
         return typeof this.$documentFilter === 'function' ?
-            this.$documentFilter(this) : this.$documentFilter;
+            this.$documentFilter(args, this) : this.$documentFilter;
+    }
+    async _intercept(callback, args) {
+        if (this.$interceptor)
+            return this.$interceptor(callback, args, this);
+        return callback();
     }
 }
 exports.MongoSingletonService = MongoSingletonService;