@chevre/domain 21.2.0-alpha.159 → 21.2.0-alpha.160

package/example/src/chevre/giveUpStartDatePassedCertainPeriod.ts

@@ -0,0 +1,56 @@
+// 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) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const startLte = moment()
+        .add(-1, 'week')
+        .toDate();
+
+    const cursor = actionRepo.getCursor(
+        {
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            actionStatus: { $eq: chevre.factory.actionStatusType.ActiveActionStatus },
+            startDate: { $lt: startLte }
+        },
+        {
+            _id: 1,
+            startDate: 1,
+            typeOf: 1,
+            project: 1
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    // let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        // if (i > 1) {
+        //     return;
+        // }
+
+        console.log('updating...', doc.project.id, doc.typeOf, doc.id, doc.startDate);
+        const result = await actionRepo.giveUpStartDatePassedCertainPeriod({
+            id: { $eq: doc.id },
+            startDate: { $lt: startLte },
+            error: new chevre.factory.errors.GatewayTimeout('unexpected timeout')
+        });
+        console.log('updated', doc.project.id, doc.typeOf, doc.id, doc.startDate, result);
+    });
+
+    console.log(i, 'actions checked');
+    // console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/sendEmailMessage.ts

@@ -61,8 +61,7 @@ async function main() {
             },
             customer: {
                 typeOf: chevre.factory.creativeWorkType.WebApplication,
-                id: 'xxxx',
-                name: '****'
+                id: 'xxxx'
             },
             orderNumber: 'CIN1-3970498-5700993',
             price: 0,

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

@@ -1,6 +1,9 @@
 import * as factory from '../factory';
 export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";
+export type IMaskedCustomer = factory.order.ICustomer | Pick<factory.order.ICustomer, 'id' | 'typeOf'>;
 /**
  * 個人情報のマスクされたカスタマーを作成する
  */
-export declare function createMaskedCustomer(order: Pick<factory.order.IOrder, 'customer'>): factory.order.ICustomer;
+export declare function createMaskedCustomer(order: Pick<factory.order.IOrder, 'customer'>, options: {
+    noProfile: boolean;
+}): IMaskedCustomer;

package/lib/chevre/factory/order.js

@@ -6,11 +6,24 @@ const MASKED_PROFILE = '****';
 /**
  * 個人情報のマスクされたカスタマーを作成する
  */
-function createMaskedCustomer(order) {
-    return Object.assign(Object.assign({}, order.customer), { 
-        // ↓identifierも隠蔽
-        identifier: [], 
-        // ↓additionalPropertyも隠蔽
-        additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
+function createMaskedCustomer(order, options) {
+    // noProfileに対応する(2023-07-03~)
+    if ((options === null || options === void 0 ? void 0 : options.noProfile) === true) {
+        return {
+            id: order.customer.id,
+            typeOf: order.customer.typeOf
+            // ↓identifierも隠蔽
+            // identifier: [],
+            // ↓additionalPropertyも隠蔽
+            // additionalProperty: [],
+        };
+    }
+    else {
+        return Object.assign(Object.assign({}, order.customer), { 
+            // ↓identifierも隠蔽
+            identifier: [], 
+            // ↓additionalPropertyも隠蔽
+            additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
+    }
 }
 exports.createMaskedCustomer = createMaskedCustomer;

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
@@ -61,6 +85,18 @@ export declare class MongoRepository {
         id: string;
         error: any;
     }): Promise<IAction<T>>;
+    /**
+     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
+     */
+    giveUpStartDatePassedCertainPeriod(params: {
+        id?: {
+            $eq?: string;
+        };
+        error: any;
+        startDate: {
+            $lt: Date;
+        };
+    }): Promise<any>;
     findById<T extends factory.actionType>(params: {
         typeOf: T;
         id: string;
@@ -220,6 +256,7 @@ export declare class MongoRepository {
         startFrom: Date;
         startThrough: Date;
     }): Promise<IAggregateAction>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     private agggregateByStatus;
 }
 export {};

package/lib/chevre/repo/action.js

@@ -530,6 +530,22 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
+     */
+    giveUpStartDatePassedCertainPeriod(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.actionModel.updateMany(Object.assign({ actionStatus: { $eq: factory.actionStatusType.ActiveActionStatus }, 
+                // 一定期間過ぎたもの
+                startDate: { $lt: params.startDate.$lt } }, (typeof ((_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { _id: { $eq: params.id.$eq } } : undefined), {
+                actionStatus: factory.actionStatusType.FailedActionStatus,
+                error: params.error,
+                endDate: new Date()
+            })
+                .exec();
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.actionModel.findOne({
@@ -893,6 +909,11 @@ class MongoRepository {
             return { statuses };
         });
     }
+    getCursor(conditions, projection) {
+        return this.actionModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Ascending })
+            .cursor();
+    }
     // tslint:disable-next-line:max-func-body-length
     agggregateByStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -117,7 +117,7 @@ function creteOrder4inform(order) {
                 // whitelistで作成する(2022-07-19~)
                 project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
                 // mask
-                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
+                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order, { noProfile: false })), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
                     // identifierは必要
                     // 予約後を隠蔽(2022-12-24~)
                     identifier: (Array.isArray(order.customer.identifier))

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

@@ -24,11 +24,11 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,

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

@@ -105,12 +105,12 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
@@ -168,11 +168,11 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -44,7 +44,7 @@ function returnOrder(params) {
         const simpleOrder = {
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -40,11 +40,11 @@ function sendOrder(params) {
             if (order.confirmationNumber !== confirmationNumber) {
                 throw new factory.errors.NotFound('Order');
             }
-            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
                 seller: order.seller,
-                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,
@@ -57,7 +57,7 @@ function sendOrder(params) {
                 // sendEmailMessage: undefined
                 },
                 project: order.project,
-                recipient: order.customer,
+                recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);

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

@@ -47,7 +47,7 @@ function createGivePointAwardActions(params) {
                             typeOf: params.order.typeOf,
                             seller: params.order.seller,
                             // mask
-                            customer: (0, order_1.createMaskedCustomer)(params.order),
+                            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
                             // IOrderへ移行(2022-11-17~)
                             // confirmationNumber: params.order.confirmationNumber,
                             orderNumber: params.order.orderNumber,

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

@@ -65,7 +65,7 @@ function createMoneyTransferActions(params) {
                         typeOf: params.order.typeOf,
                         seller: params.order.seller,
                         // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order),
+                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
                         // IOrderへ移行(2022-11-17~)
                         // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,

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

@@ -50,7 +50,7 @@ function createRegisterServiceActions(params) {
                         typeOf: params.order.typeOf,
                         seller: params.order.seller,
                         // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order),
+                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
                         // IOrderへ移行(2022-11-17~)
                         // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,

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

@@ -19,12 +19,12 @@ function createSendEmailMessageActions(params) {
         // 注文配送メール送信設定
         const sendEmailMessageActions = [];
         const project = params.transaction.project;
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const sendActionPurpose = {
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
@@ -48,8 +48,8 @@ function createSendEmailMessageActions(params) {
                     agent: params.transaction.project,
                     recipient: {
                         typeOf: params.order.customer.typeOf,
-                        id: params.order.customer.id,
-                        name: String(params.order.customer.name)
+                        id: params.order.customer.id
+                        // name: String(params.order.customer.name)
                     },
                     potentialActions: {},
                     purpose: sendActionPurpose

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

@@ -28,13 +28,13 @@ function createPotentialActions(params) {
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
@@ -50,8 +50,7 @@ function createPotentialActions(params) {
             agent: params.transaction.project,
             recipient: {
                 typeOf: params.order.customer.typeOf,
-                id: params.order.customer.id,
-                name: String(params.order.customer.name)
+                id: params.order.customer.id
             },
             potentialActions: {
                 moneyTransfer: moneyTransferActions,

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

@@ -17,12 +17,12 @@ function createReturnMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const returnMoneyTransferActions = [];
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const purpose = {
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,

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

@@ -44,7 +44,7 @@ function createReturnPaymentMethodPotentialActions(params) {
                 typeOf: order.typeOf,
                 seller: order.seller,
                 // mask
-                customer: (0, order_1.createMaskedCustomer)(order),
+                customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
                 // IOrderへ移行(2022-11-17~)
                 // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
@@ -59,8 +59,8 @@ function createReturnPaymentMethodPotentialActions(params) {
                 agent: order.project,
                 recipient: {
                     typeOf: order.customer.typeOf,
-                    id: order.customer.id,
-                    name: String(order.customer.name)
+                    id: order.customer.id
+                    // name: String(order.customer.name)
                 },
                 potentialActions: {},
                 purpose: sendActionPurpose
@@ -109,7 +109,7 @@ function createReturnPaymentMethodActions(params) {
                             typeOf: order.typeOf,
                             seller: order.seller,
                             // mask
-                            customer: (0, order_1.createMaskedCustomer)(order),
+                            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
                             // IOrderへ移行(2022-11-17~)
                             // confirmationNumber: order.confirmationNumber,
                             orderNumber: order.orderNumber,
@@ -188,7 +188,7 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
                     typeOf: order.typeOf,
                     seller: order.seller,
                     // mask
-                    customer: (0, order_1.createMaskedCustomer)(order),
+                    customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
                     // IOrderへ移行(2022-11-17~)
                     // confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,

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

@@ -48,12 +48,12 @@ function createReturnPointAwardActions(params) {
             }
         }
         const order = params.order;
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const purpose = {
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,

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

@@ -22,7 +22,7 @@ function createSendEmailMessaegActionsOnReturn(params) {
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
             // IOrderへ移行(2022-11-17~)
             // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
@@ -47,8 +47,8 @@ function createSendEmailMessaegActionsOnReturn(params) {
                     agent: order.project,
                     recipient: {
                         typeOf: order.customer.typeOf,
-                        id: order.customer.id,
-                        name: String(order.customer.name)
+                        id: order.customer.id
+                        // name: String(order.customer.name)
                     },
                     potentialActions: {},
                     purpose: sendActionPurpose

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

@@ -53,7 +53,7 @@ function createPotentialActions(params) {
                     typeOf: order.typeOf,
                     seller: order.seller,
                     // mask
-                    customer: (0, order_1.createMaskedCustomer)(order),
+                    customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
                     confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
                     price: order.price,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.46",
-    "@cinerino/sdk": "3.157.0-alpha.21",
+    "@chevre/factory": "4.313.0-alpha.48",
+    "@cinerino/sdk": "3.157.0-alpha.23",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.159"
+  "version": "21.2.0-alpha.160"
 }