@chevre/domain 20.4.0-alpha.15 → 20.4.0-alpha.16

package/example/src/chevre/deleteMovieTicketCategoryChargePriceSpecs.ts

@@ -11,7 +11,7 @@ async function main() {
     const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
 
     const result = await priceSpecificationRepo.deleteUnnecessaryMovieTicketTypeChargePriceSpecs({
-        project: { id: 'cinerino' }
+        // project: { id: 'cinerino' }
     });
     console.log('deleted', result);
 }

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -7,7 +7,8 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     // const accountRepo = new chevre.repository.Account(mongoose.connection);
-    const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+    // const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
 
     let updateResult: any;
     // updateResult = await accountRepo.unsetUnnecessaryFields({
@@ -15,16 +16,21 @@ async function main() {
     //     $unset: { status: 1 }
     // });
     // console.log('accounts unset.', updateResult);
-    updateResult = await permitRepo.unsetUnnecessaryFields({
-        filter: { 'paymentAccount.project': { $exists: true } },
-        $unset: { 'paymentAccount.project': 1 }
-    });
-    console.log('permits unset', updateResult);
-    updateResult = await permitRepo.unsetUnnecessaryFields({
-        filter: { 'issuedThrough.project': { $exists: true } },
-        $unset: { 'issuedThrough.project': 1 }
+    // updateResult = await permitRepo.unsetUnnecessaryFields({
+    //     filter: { 'paymentAccount.project': { $exists: true } },
+    //     $unset: { 'paymentAccount.project': 1 }
+    // });
+    // console.log('permits unset', updateResult);
+    // updateResult = await permitRepo.unsetUnnecessaryFields({
+    //     filter: { 'issuedThrough.project': { $exists: true } },
+    //     $unset: { 'issuedThrough.project': 1 }
+    // });
+    // console.log('permits unset', updateResult);
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { hasOfferCatalog: { $exists: true } },
+        $unset: { hasOfferCatalog: 1 }
     });
-    console.log('permits unset', updateResult);
+    console.log('events unset', updateResult);
 }
 
 main()

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

@@ -141,9 +141,10 @@ export declare class MongoRepository {
     }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
     bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteOpResultObject>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
-    deleteUnnecessaryProjectAttributesById(params: {
-        id: string;
-    }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {
         project?: {
             id?: {

package/lib/chevre/repo/event.js

@@ -751,18 +751,9 @@ class MongoRepository {
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }
-    deleteUnnecessaryProjectAttributesById(params) {
+    unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.updateOne({
-                _id: { $eq: params.id }
-            }, {
-                $unset: {
-                    'location.project': 1,
-                    'workPerformed.project': 1,
-                    'superEvent.location.project': 1,
-                    'superEvent.workPerformed.project': 1
-                }
-            })
+            return this.eventModel.updateMany(params.filter, { $unset: params.$unset })
                 .exec();
         });
     }

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

@@ -31,8 +31,8 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params: {
-        project: {
-            id: string;
+        project?: {
+            id?: string;
         };
     }): Promise<{
         ok?: number | undefined;

package/lib/chevre/repo/priceSpecification.js

@@ -278,12 +278,11 @@ class MongoRepository {
         });
     }
     deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.priceSpecificationModel.deleteMany({
-                'project.id': { $eq: params.project.id },
-                typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification },
-                price: { $eq: 0 }
-            })
+            return this.priceSpecificationModel.deleteMany(Object.assign({ typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification }, price: { $eq: 0 } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'project.id': { $eq: params.project.id } }
+                : undefined))
                 .exec();
         });
     }

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

@@ -269,11 +269,10 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const authorizeResult = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
+        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: Object.assign({ 'object.accountId': (_a = authorizeResult.checkResult) === null || _a === void 0 ? void 0 : _a.movieTickets[0].identifier, 'object.paymentMethod.accountId': (_b = authorizeResult.checkResult) === null || _b === void 0 ? void 0 : _b.movieTickets[0].identifier, 'object.checkResult': authorizeResult.checkResult }, (authorizeResult.payAction !== undefined) ? { 'object.payAction': authorizeResult.payAction } : undefined)
+            update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)
         })(repos);
     });
 }

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -57,9 +57,14 @@ declare function checkByIdentifier(params: {
     project: ProjectRepo;
 }) => Promise<ICheckResult>;
 interface IAuthorizeResult {
-    checkResult: ICheckResult;
-    payAction?: factory.action.IAction<factory.action.IAttributes<factory.actionType.PayAction, any, any>>;
+    accountId: string;
+    checkResult?: ICheckResult;
+    payAction: factory.action.trade.pay.IAction;
 }
+/**
+ * MovieTicket承認
+ * オーソリサービスが存在するわけではないので、実質着券する
+ */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;

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

@@ -17,6 +17,7 @@ const surfrock = require("@surfrock/sdk");
 const moment = require("moment-timezone");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const factory_1 = require("./movieTicket/factory");
 const validation_1 = require("../assetTransaction/pay/movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
@@ -258,14 +259,22 @@ function purchaseNumberAuthResult2movieTickets(params) {
     }
     return movieTickets;
 }
+/**
+ * MovieTicket承認
+ * オーソリサービスが存在するわけではないので、実質着券する
+ */
 function authorize(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        let accountId;
         let checkResult;
         let payAction;
         try {
-            // MovieTicket決済の場合、認証
-            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
+            // オプション追加(2023-02-24~)
+            if (settings_1.settings.useCheckMovieTicketBeforePay) {
+                // MovieTicket決済の場合、認証
+                checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
+            }
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -273,7 +282,10 @@ function authorize(params, transaction, paymentServiceId) {
                 ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId
                 : transaction.id;
             const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
-            const accountId = (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? (_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.identifier : undefined;
+            accountId = (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? (_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.identifier : undefined;
+            if (typeof accountId !== 'string' || accountId.length === 0) {
+                throw new factory.errors.ArgumentNull('object.paymentMethod.movieTickets.identifier');
+            }
             const payObject = {
                 typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
                 id: paymentServiceId,
@@ -284,10 +296,7 @@ function authorize(params, transaction, paymentServiceId) {
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            const payActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], 
-                // agent:Projectに変更(2022-05-19~)
-                // agent: transaction.agent,
-                agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
+            const payActionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: transaction.project, recipient: transaction.recipient }, (params.purpose !== undefined)
                 ? { purpose: params.purpose }
                 : { purpose: { typeOf: transaction.typeOf, transactionNumber: transaction.transactionNumber, id: transaction.id } });
             // 着券させざるをえないが、informPaymentはしない(注文がまだ存在しないため)
@@ -296,7 +305,7 @@ function authorize(params, transaction, paymentServiceId) {
         catch (error) {
             throw (0, errorHandler_1.handleMvtkReserveError)(error);
         }
-        return Object.assign({ checkResult }, (payAction !== undefined) ? { payAction } : undefined);
+        return { accountId, checkResult, payAction };
     });
 }
 exports.authorize = authorize;

package/lib/chevre/settings.d.ts

@@ -26,6 +26,7 @@ export declare type ISettings = factory.project.ISettings & {
     useAggregateEntranceGateProjects: string[];
     useAggregateOfferProjects: string[];
     useOfferRateLimitProjects: string[];
+    useCheckMovieTicketBeforePay: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -100,4 +100,4 @@ exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrder
         ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')
         : [], useOfferRateLimitProjects: (typeof process.env.USE_OFFER_RATE_LIMIT_PROJECTS === 'string')
         ? process.env.USE_OFFER_RATE_LIMIT_PROJECTS.split(',')
-        : [] });
+        : [], useCheckMovieTicketBeforePay: process.env.USE_CHECK_MOVIE_TICKET_BEFORE_PAY === '1' });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.11",
-    "@cinerino/sdk": "3.140.0-alpha.11",
+    "@chevre/factory": "4.289.0-alpha.12",
+    "@cinerino/sdk": "3.140.0-alpha.14",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.15"
+  "version": "20.4.0-alpha.16"
 }