@chevre/domain 21.18.0-alpha.3 → 21.18.0-alpha.4

package/lib/chevre/repo/offerCatalog.d.ts

@@ -35,11 +35,17 @@ export declare class MongoRepository {
     private readonly offerCatalogModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
-    save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    save(params: factory.offerCatalog.IOfferCatalog & {
+        $unset?: any;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * プロジェクトとコードから冪等保管
      */
-    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<{
+        id: string;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalog.js

@@ -133,13 +133,13 @@ class MongoRepository {
             let doc;
             if (params.id === '') {
                 const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                const id = uniqid();
-                doc = yield this.offerCatalogModel.create(Object.assign(Object.assign({}, params), { _id: id }));
+                const newId = uniqid();
+                const { id, $unset } = params, creatingDoc = __rest(params, ["id", "$unset"]);
+                doc = yield this.offerCatalogModel.create(Object.assign(Object.assign({}, creatingDoc), { _id: newId }));
             }
             else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.offerCatalogModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const { id, identifier, itemOffered, project, typeOf, $unset } = params, updateFields = __rest(params, ["id", "identifier", "itemOffered", "project", "typeOf", "$unset"]); // 上書き禁止属性を除外
+                doc = yield this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
             }
             if (doc === null) {
@@ -155,14 +155,14 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const newId = uniqid();
-            const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
+            const { id, identifier, itemOffered, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "itemOffered", "project", "typeOf"]);
             const doc = yield this.offerCatalogModel.findOneAndUpdate({
                 identifier: { $eq: params.identifier },
                 'project.id': { $eq: params.project.id }
             }, {
                 $set: updateFields,
-                $setOnInsert: { _id: newId, identifier, project, typeOf }
-            }, { upsert: true, new: true })
+                $setOnInsert: { _id: newId, identifier, itemOffered, project, typeOf }
+            }, { upsert: true, new: true, projection: { _id: 1 } })
                 .exec();
             return doc.toObject();
         });

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.3"
+  "version": "21.18.0-alpha.4"
 }