@chevre/domain 21.4.0-alpha.2 → 21.4.0-alpha.3

package/example/src/chevre/searchProductOffers.ts

@@ -16,6 +16,12 @@ async function main() {
     });
     console.log(offers);
     console.log(offers.length);
+
+    // await productOfferRepo.deleteOne({
+    //     project: { id: PROJECT_ID },
+    //     seller: { id: 'xxx' },
+    //     itemOffered: { id: 'xxx' }
+    // });
 }
 
 main()

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

@@ -17,16 +17,18 @@ export declare class MongoRepository {
                 $eq?: string;
             };
         };
-        id?: {
-            $eq?: string;
+        itemOffered?: {
+            id?: {
+                $eq?: string;
+            };
         };
         seller?: {
             id?: {
                 $eq?: string;
             };
         };
-    }): Promise<(Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'> & {
-        offers: Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'>;
+    }): Promise<(Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'> & {
+        itemOffered: Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'>;
     })[]>;
     create(params: factory.product.IOffer & {
         project: {
@@ -54,4 +56,17 @@ export declare class MongoRepository {
     }): Promise<{
         id: string;
     }>;
+    deleteOne(params: Pick<factory.product.IOffer, 'seller'> & {
+        project: {
+            id: string;
+        };
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    }>;
 }

package/lib/chevre/repo/productOffer.js

@@ -25,7 +25,7 @@ class MongoRepository {
      * プロダクトオファー検索
      */
     search(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{
                     $match: {
@@ -41,11 +41,11 @@ class MongoRepository {
             if (typeof projectIdEq === 'string') {
                 matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
             }
-            const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof idEq === 'string') {
-                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } } });
+            const itemOfferedIdEq = (_d = (_c = params.itemOffered) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof itemOfferedIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(itemOfferedIdEq) } } });
             }
-            const sellerIdEq = (_e = (_d = params.seller) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+            const sellerIdEq = (_f = (_e = params.seller) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof sellerIdEq === 'string') {
                 matchStages.push({ $match: { 'offers.seller.id': { $exists: true, $eq: sellerIdEq } } });
             }
@@ -60,16 +60,16 @@ class MongoRepository {
                 {
                     $project: {
                         _id: 0,
-                        offers: {
-                            availabilityEnds: '$offers.availabilityEnds',
-                            availabilityStarts: '$offers.availabilityStarts',
-                            validFrom: '$offers.validFrom',
-                            validThrough: '$offers.validThrough',
-                            seller: '$offers.seller'
+                        itemOffered: {
+                            id: { $toString: '$_id' },
+                            name: '$name',
+                            typeOf: '$typeOf'
                         },
-                        id: { $toString: '$_id' },
-                        name: '$name',
-                        typeOf: '$typeOf'
+                        availabilityEnds: '$offers.availabilityEnds',
+                        availabilityStarts: '$offers.availabilityStarts',
+                        validFrom: '$offers.validFrom',
+                        validThrough: '$offers.validThrough',
+                        seller: '$offers.seller'
                     }
                 }
             ]);
@@ -158,5 +158,28 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    deleteOne(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId !== 'string' || sellerId.length === 0) {
+                throw new factory.errors.ArgumentNull('seller.id');
+            }
+            const doc = yield this.productModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.itemOffered.id },
+                'offers.seller.id': { $exists: true, $eq: sellerId }
+            }, {
+                $pull: { offers: { 'seller.id': { $exists: true, $eq: sellerId } } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Product');
+            }
+            return doc.toObject();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/package.json

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