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

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -20,10 +20,10 @@ async function main() {
             'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
             'result.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
             startDate: {
-                $gte: moment('2023-05-01T00:00:00Z')
-                    .toDate(),
-                $lte: moment('2023-08-01T00:00:00Z')
+                $gte: moment('2022-08-16T00:00:00Z')
                     .toDate()
+                // $lte: moment('2023-08-01T00:00:00Z')
+                //     .toDate()
             }
         },
         {

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,25 +1,31 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
-        filter: { 'offers.project': { $exists: true } },
-        $unset: { 'offers.project': 1 }
-    });
-    console.log('unset processed.', updateResult);
-
-    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
-        filter: { 'offers.priceCurrency': { $exists: true } },
-        $unset: { 'offers.priceCurrency': 1 }
+    updateResult = await transactionRepo.unsetUnnecessaryFields({
+        filter: {
+            'project.id': { $eq: PROJECT_ID },
+            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                $lte: moment('2023-08-16T07:26:00Z')
+                    .toDate()
+            },
+            'object.authorizeActions': { $exists: true }
+        },
+        $unset: { 'object.authorizeActions': 1 }
     });
-    console.log('unset processed.', updateResult);
+    console.log('unset processed.', updateResult, 'PROJECT_ID:', PROJECT_ID);
 }
 
 main()

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

@@ -252,6 +252,18 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
+    deleteManyEndedByIds(params: {
+        typeOf: {
+            $in: factory.eventType[];
+        };
+        project: {
+            id: string;
+        };
+        ids: string[];
+        endDate: {
+            $lte: Date;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -966,6 +966,17 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteManyEndedByIds(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $in: params.typeOf.$in },
+                'project.id': { $eq: params.project.id },
+                _id: { $in: params.ids },
+                endDate: { $lte: params.endDate.$lte }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

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

@@ -190,6 +190,10 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     aggregatePlaceOrder(params: {
         project?: {
             id?: {

package/lib/chevre/repo/transaction.js

@@ -770,6 +770,12 @@ class MongoRepository {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.transactionModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
     aggregatePlaceOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -1,4 +1,5 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -11,6 +12,7 @@ declare function deleteOrder(params: {
     object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
     accountingReport: AccountingReportRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/order/deleteOrder.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = void 0;
 const factory_1 = require("../delivery/factory");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -38,6 +39,10 @@ function deleteOrder(params) {
         }
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        // 終了済の関連イベントを削除(2023-08-16~)
+        if (settings_1.USE_DELETE_EVENT_BY_ORDER) {
+            yield deleteEventsByOrder(order)(repos);
+        }
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
     });
@@ -73,3 +78,40 @@ function deleteOwnershipInfosByOrder(order) {
         }
     });
 }
+function deleteEventsByOrder(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const reservationForIds = acceptedOffers.filter((o) => {
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                && typeof o.itemOffered.reservationFor.id === 'string';
+        })
+            .map((o) => {
+            return String(o.itemOffered.reservationFor.id);
+        });
+        if (reservationForIds.length > 0) {
+            for (const reservationForId of reservationForIds) {
+                // 関連注文が存在しなければ削除
+                const relatedOrders = yield repos.order.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: order.project.id } },
+                    acceptedOffers: {
+                        itemOffered: {
+                            reservationFor: { ids: [reservationForId] }
+                        }
+                    }
+                }, { _id: 1 });
+                if (relatedOrders.length === 0) {
+                    yield repos.event.deleteManyEndedByIds({
+                        typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] },
+                        project: { id: order.project.id },
+                        ids: [reservationForId],
+                        endDate: { $lte: now }
+                    });
+                }
+            }
+        }
+    });
+}

package/lib/chevre/service/task/deleteTransaction.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -15,6 +16,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

package/lib/chevre/settings.d.ts

@@ -41,6 +41,7 @@ export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
 export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
+export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -73,6 +73,7 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 //     : [];
 exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
 exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
+exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 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.7.0-alpha.8"
+  "version": "21.7.0-alpha.9"
 }