@chevre/domain 20.2.0-alpha.41 → 20.2.0-alpha.43

package/example/src/chevre/findByOrderNumberAndReservationId.ts

@@ -0,0 +1,20 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const orderRepo = new chevre.repository.Order(mongoose.connection);
+
+    const order = await orderRepo.findByOrderNumberAndReservationId({
+        orderNumber: 'CIN9-4783801-1618274',
+        reservationId: '139787058570943-0'
+    });
+    console.log('order found', order);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -35,7 +35,7 @@ export declare class MongoRepository {
     /**
      * アクション検索
      */
-    search<T extends factory.actionType>(params: factory.action.ISearchConditions, projection?: any): Promise<IAction<T>[]>;
+    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IAction<T>[]>;
     /**
      * アクション開始
      */

package/lib/chevre/repo/action.js

@@ -386,16 +386,28 @@ class MongoRepository {
     /**
      * アクション検索
      */
-    search(params, projection) {
+    search(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, (projection !== undefined && projection !== null)
-                ? projection
-                : {
+            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 query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)
@@ -507,7 +519,7 @@ class MongoRepository {
                 project: { id: { $eq: params.project.id } },
                 typeOf: { $eq: factory.actionType.PayAction },
                 object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
-            });
+            }, [], []);
             return payActions.shift();
         });
     }

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

@@ -1,7 +1,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 import { modelName } from './mongoose/model/authorization';
-export declare type IData = any;
+export declare type IObject = factory.authorization.IObject;
 export declare type ICode = string;
 export { modelName };
 /**
@@ -19,7 +19,7 @@ export declare class MongoRepository {
             id: string;
             typeOf: factory.organizationType.Project;
         };
-        data: IData;
+        object: IObject;
         validFrom: Date;
         expiresInSeconds: number;
     }[]): Promise<factory.authorization.IAuthorization[]>;
@@ -32,22 +32,9 @@ export declare class MongoRepository {
             typeOf: factory.organizationType.Project;
         };
         code: ICode;
-    }): Promise<IData>;
+    }): Promise<IObject>;
     count(params: factory.authorization.ISearchConditions): Promise<number>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
-    /**
-     * コードを保管する
-     */
-    save(params: {
-        project: {
-            id: string;
-            typeOf: factory.organizationType.Project;
-        };
-        code: ICode;
-        data: IData;
-        validFrom: Date;
-        expiresInSeconds: number;
-    }[]): Promise<factory.authorization.IAuthorization[]>;
     deleteByCode(params: {
         code: string;
     }): Promise<{
@@ -55,4 +42,8 @@ export declare class MongoRepository {
         ok?: number;
         deletedCount?: number;
     } | null>;
+    /**
+     * コードを保管する
+     */
+    private save;
 }

package/lib/chevre/repo/code.js

@@ -134,7 +134,7 @@ class MongoRepository {
                 return {
                     project: p.project,
                     code: code,
-                    data: p.data,
+                    object: p.object,
                     validFrom: p.validFrom,
                     expiresInSeconds: p.expiresInSeconds
                 };
@@ -204,6 +204,23 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    deleteByCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.authorizationModel.deleteOne({
+                code: { $exists: true, $eq: params.code }
+            })
+                .exec()
+                .then((result) => {
+                return {
+                    n: result === null || result === void 0 ? void 0 : result.n,
+                    // opTime: result.opTime,
+                    ok: result === null || result === void 0 ? void 0 : result.ok,
+                    // operationTime,
+                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
+                };
+            });
+        });
+    }
     /**
      * コードを保管する
      */
@@ -218,7 +235,7 @@ class MongoRepository {
                         project: p.project,
                         typeOf: 'Authorization',
                         code: p.code,
-                        object: p.data,
+                        object: p.object,
                         validFrom: p.validFrom,
                         validUntil: validUntil
                     };
@@ -234,22 +251,5 @@ class MongoRepository {
             }
         });
     }
-    deleteByCode(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.authorizationModel.deleteOne({
-                code: { $exists: true, $eq: params.code }
-            })
-                .exec()
-                .then((result) => {
-                return {
-                    n: result === null || result === void 0 ? void 0 : result.n,
-                    // opTime: result.opTime,
-                    ok: result === null || result === void 0 ? void 0 : result.ok,
-                    // operationTime,
-                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
-                };
-            });
-        });
-    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -44,6 +44,10 @@ export declare class MongoRepository {
         inclusion: string[];
         exclusion: string[];
     }): Promise<factory.order.IOrder>;
+    findByOrderNumberAndReservationId(params: {
+        orderNumber: string;
+        reservationId: string;
+    }): Promise<Pick<factory.order.IOrder, 'orderNumber' | 'orderStatus' | 'typeOf'>>;
     /**
      * 注文番号で削除する
      */

package/lib/chevre/repo/order.js

@@ -805,6 +805,30 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    findByOrderNumberAndReservationId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                orderStatus: 1,
+                typeOf: 1,
+                orderNumber: 1,
+                _id: 0
+            };
+            const doc = yield this.orderModel.findOne({
+                orderNumber: { $eq: params.orderNumber },
+                acceptedOffers: {
+                    $elemMatch: {
+                        'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                        'itemOffered.id': { $eq: params.reservationId }
+                    }
+                }
+            }, projection)
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
     /**
      * 注文番号で削除する
      */

package/lib/chevre/service/code.d.ts

@@ -2,7 +2,6 @@ import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as AuthorizationRepo } from '../repo/code';
 import * as factory from '../factory';
 export declare type IToken = string;
-export declare type IData = any;
 export declare type ICode = string;
 /**
  * 承認を削除する
@@ -24,7 +23,7 @@ export declare function getToken(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;
-export declare function verifyToken<T>(params: {
+export declare function verifyToken<T = factory.authorization.IObject>(params: {
     project: {
         id: string;
     };

package/lib/chevre/service/report/telemetry.js

@@ -181,7 +181,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         const actionsOnExpiredTransactions = yield repos.action.search({
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             purpose: { id: { $in: expiredTransactionIds } }
-        });
+        }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
             return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;

package/lib/chevre/service/reserve/useReservation.js

@@ -26,12 +26,18 @@ function verifyToken4reservation(params) {
         })({});
         switch (payload.typeOf) {
             case factory.order.OrderType.Order:
-                // 注文検索
-                const order = yield repos.order.findByOrderNumber({
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
                     orderNumber: payload.orderNumber,
-                    inclusion: ['orderStatus', 'acceptedOffers'],
-                    exclusion: []
+                    reservationId: params.reservationId
                 });
+                // 注文検索
+                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
+                //     await repos.order.findByOrderNumber({
+                //         orderNumber: payload.orderNumber,
+                //         inclusion: ['orderStatus', 'acceptedOffers'],
+                //         exclusion: []
+                //     });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:
@@ -39,15 +45,17 @@ function verifyToken4reservation(params) {
                     default:
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
-                const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                    return (offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || offer.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        && offer.itemOffered.id === params.reservationId;
-                });
-                if (!reservationExistsInOrder) {
-                    throw new factory.errors.NotFound('AcceptedOffer');
-                }
+                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
+                //     return (
+                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
+                //     )
+                //         && offer.itemOffered.id === params.reservationId;
+                // });
+                // if (!reservationExistsInOrder) {
+                //     throw new factory.errors.NotFound('AcceptedOffer');
+                // }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.284.0-alpha.1",
+    "@chevre/factory": "4.284.0-alpha.2",
     "@cinerino/sdk": "3.136.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.41"
+  "version": "20.2.0-alpha.43"
 }