@chevre/domain 22.7.0-alpha.13 → 22.7.0-alpha.14

package/example/src/chevre/deleteDiscontinuedPeople.ts

@@ -0,0 +1,114 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { call as deletePerson } from '../../../lib/chevre/service/task/deletePerson';
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+    if (typeof setting?.userPoolIdNew !== 'string') {
+        throw new chevre.factory.errors.NotFound('setting.userPoolIdNew');
+    }
+
+    const DISCONTINUE_PEOPLE_PROJECT = process.env.USE_DISCONTINUE_PEOPLE_PROJECT;
+
+    /**
+     * 1リクエストで生成するタスク数
+     */
+    const NUM_TASKS = 1;
+
+    if (typeof DISCONTINUE_PEOPLE_PROJECT === 'string' && DISCONTINUE_PEOPLE_PROJECT.length > 0) {
+        const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+        const deletingOwnershipInfos = (await ownershipInfoRepo.projectFields({
+            limit: NUM_TASKS,
+            page: 1,
+            sort: { ownedFrom: chevre.factory.sortType.Ascending },
+            project: { id: { $eq: DISCONTINUE_PEOPLE_PROJECT } },
+            typeOfGood: {
+                // typeOf: { $eq: chevre.factory.permit.PermitType.Permit },
+                issuedThrough: {
+                    typeOf: {
+                        // $eq: chevre.factory.product.ProductType.PaymentCard
+                        $eq: chevre.factory.product.ProductType.EventService
+                    }
+                }
+            }
+        }));
+        console.log(deletingOwnershipInfos.length, 'deletingOwnershipInfos found');
+
+        if (deletingOwnershipInfos.length > 0) {
+            const runsAt: Date = new Date();
+            const userPoolId: string = setting.userPoolIdNew;
+
+            for (const deletingOwnershipInfo of deletingOwnershipInfos) {
+                const personId: string = (Array.isArray(deletingOwnershipInfo.ownedBy))
+                    ? deletingOwnershipInfo.ownedBy[0]?.id
+                    : deletingOwnershipInfo.ownedBy.id;
+
+                console.log(
+                    'deleting person...',
+                    personId, deletingOwnershipInfo.id, deletingOwnershipInfo.ownedFrom
+                );
+                await deletePerson({
+                    id: '',
+                    project: { typeOf: chevre.factory.organizationType.Project, id: DISCONTINUE_PEOPLE_PROJECT },
+                    name: chevre.factory.taskName.DeletePerson,
+                    status: chevre.factory.taskStatus.Ready,
+                    runsAt,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    data: {
+                        id: personId,
+                        agent: {
+                            id: DISCONTINUE_PEOPLE_PROJECT,
+                            typeOf: chevre.factory.organizationType.Project,
+                            name: 'example'
+                        },
+                        physically: true,
+                        userPoolId,
+                        project: { id: DISCONTINUE_PEOPLE_PROJECT },
+                        migrate: false,
+                        useUsernameAsGMOMemberId: true,
+                        executeBackground: true
+                    }
+                })(
+                    {
+                        connection: mongoose.connection,
+                        settings: new chevre.settings.Settings({
+                            abortedTasksWithoutReport: [],
+                            numTryConfirmReserveTransaction: 10,
+                            deliverOrderLimit: 1,
+                            coa: {
+                                timeout: 20000
+                            },
+                            gmo: {
+                                timeout: 5000,
+                                timeoutBackground: 5000,
+                                useFetch: true
+                            },
+                            movieticketReserve: {
+                                timeout: 1000,
+                                timeoutCheck: 1000,
+                                minIntervalBetweenPayAndRefund: 1000,
+                                credentialsExpireInSeconds: 1000
+                            },
+                            useExperimentalFeature: false
+                        }),
+                        credentials: <any>{}
+                    },
+                    {
+                        executeById: false,
+                        executeByName: true
+                    }
+                );
+            }
+        }
+    }
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -134,7 +134,7 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
     checkedAction: {
         id: string;
     };
-}): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+}): IStartOperation<Pick<factory.assetTransaction.pay.ITransaction, 'id' | 'object'>>;
 /**
  * 取引確定
  */

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

@@ -408,23 +408,18 @@ function processAuthorizeMovieTicket(params, transaction, paymentServiceId,
 // useCheckByIdentifierIfNotYet: boolean,
 options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
-        // const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
-        //     actionStatus: payAction.actionStatus,
-        //     id: payAction.id,
-        //     typeOf: payAction.typeOf
-        // };
-        return saveAuthorizeResult({
-            id: transaction.id,
-            update: {
-                // ↓discontinue(2024-06-14~)
-                // 'object.accountId': accountId,
-                // 'object.paymentMethod.accountId': accountId,
-                // 'object.payAction': payActionInObject, // 最適化(2024-04-09~)
-                // 認証レスポンスより計上金額を保管(2023-05-15~)
-                'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
-            }
-        })(repos);
+        // const { accountsReceivablesByServiceType } = await MovieTicketPayment.authorize(
+        //     params, transaction, paymentServiceId, options
+        // )(repos, settings);
+        yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
+        return transaction;
+        // discontinue(2024-12-17~)
+        // return saveAuthorizeResult({
+        //     id: transaction.id,
+        //     update: {
+        //         'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType // 認証レスポンスより計上金額を保管(2023-05-15~)
+        //     }
+        // })(repos);
     });
 }
 function saveAuthorizeResult(params) {

package/lib/chevre/service/payment/any/factory.d.ts

@@ -27,7 +27,7 @@ export declare function creatPayTransactionStartParams(params: {
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
-    payTransaction: factory.assetTransaction.pay.ITransaction;
+    payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
     permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.391.0-alpha.2",
+    "@chevre/factory": "4.391.0-alpha.3",
     "@cinerino/sdk": "10.19.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.13"
+  "version": "22.7.0-alpha.14"
 }