@chevre/domain 21.4.0-alpha.8 → 21.4.0-alpha.9

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

@@ -34,10 +34,8 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions): any[];
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions: {
-        id: string;
-    }, inclusion: string[], exclusion: string[]): Promise<ISeller>;
     /**
      * 販売者を保管する
      */
@@ -73,6 +71,9 @@ export declare class MongoRepository {
      * 販売者を削除する
      */
     deleteById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
     /**

package/lib/chevre/repo/seller.js

@@ -128,37 +128,39 @@ class MongoRepository {
     }
     /**
      * 特定販売者検索
+     * searchに置き換え(2023-07-13~)
      */
-    findById(conditions, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
-            }
-            else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
-            }
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.organizationModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById(
+    //     conditions: {
+    //         id: string;
+    //     },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<ISeller> {
+    //     let projection: { [key: string]: number } = {};
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         inclusion.forEach((field) => {
+    //             projection[field] = 1;
+    //         });
+    //     } else {
+    //         projection = {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         };
+    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
+    //             exclusion.forEach((field) => {
+    //                 projection[field] = 0;
+    //             });
+    //         }
+    //     }
+    //     const doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     /**
      * 販売者を保管する
      */
@@ -172,7 +174,10 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.organizationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const doc = yield this.organizationModel.findOneAndUpdate({
+                    _id: params.id,
+                    'project.id': { $eq: project.id }
+                }, updateFields, { upsert: false, new: true })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.organizationModel.modelName);
@@ -182,12 +187,6 @@ class MongoRepository {
             return organization;
         });
     }
-    // public async count(params: factory.seller.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.organizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 販売者検索
      */
@@ -270,7 +269,10 @@ class MongoRepository {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.organizationModel.findOneAndRemove({ _id: params.id })
+            yield this.organizationModel.findOneAndRemove({
+                _id: params.id,
+                'project.id': { $eq: params.project.id }
+            })
                 .exec();
         });
     }

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -28,7 +28,15 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

package/lib/chevre/service/assetTransaction/pay.js

@@ -210,7 +210,15 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');

package/lib/chevre/service/payment/creditCard.js

@@ -521,7 +521,15 @@ function processChangeTransaction(params) {
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const seller = yield repos.seller.findById({ id: String(params.seller.id) }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(params.seller.id) }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_a = seller.paymentAccepted) === null || _a === void 0 ? void 0 : _a.some((a) => a.paymentMethodType === params.paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('transaction', 'payment not accepted');

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -52,7 +52,15 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: sellerId }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', 'payment not accepted');

package/lib/chevre/service/payment/movieTicket.js

@@ -27,6 +27,7 @@ const onRefund_1 = require("./any/onRefund");
 /**
  * MovieTicket認証
  */
+// tslint:disable-next-line:max-func-body-length
 function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -58,7 +59,15 @@ function checkMovieTicket(params) {
                 id: eventIds[0]
             });
             // ショップ情報取得
-            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }, ['paymentAccepted', 'project'], []);
+            const sellers = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                id: { $eq: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }
+            }, ['paymentAccepted', 'project'], []);
+            const seller = sellers.shift();
+            if (seller === undefined) {
+                throw new factory.errors.NotFound(factory.organizationType.Corporation);
+            }
             const paymentAccepted = (_f = seller.paymentAccepted) === null || _f === void 0 ? void 0 : _f.some((a) => a.paymentMethodType === paymentMethodType);
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
@@ -302,7 +311,15 @@ function payActionParams2seatInfoSyncIn(params) {
         // イベント取得属性最適化(2023-01-23~)
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
         const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }, ['paymentAccepted', 'project'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }
+        }, ['paymentAccepted', 'project'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({ paymentMethodType, seller, paymentServiceId })(repos);

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -28,7 +28,15 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'typeOf'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;

package/lib/chevre/service/transaction/placeOrderInProgress.js

@@ -29,12 +29,15 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'project', 'typeOf', 'makesOffer'], []
-        // {
-        //     hasMerchantReturnPolicy: 0,
-        //     paymentAccepted: 0
-        // }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'project', 'typeOf', 'makesOffer'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {

package/lib/chevre/service/transaction/returnOrder.js

@@ -29,9 +29,15 @@ function start(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []
-        // { additionalProperty: 0, paymentAccepted: 0 }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(orders[0].seller.id) }
+        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         yield validateOrder({ orders })(repos);
         let offers = [];
         if (offerIds.length > 0) {

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.8"
+  "version": "21.4.0-alpha.9"
 }