@chevre/domain 22.7.0-alpha.16 → 22.7.0-alpha.17

package/example/src/chevre/deleteDiscontinuedPeople.ts

@@ -48,7 +48,7 @@ async function main() {
                     $eq: chevre.factory.product.ProductType.EventService
                 },
                 ownedFrom: {
-                    $lte: moment('2024-03-01T00:00:00Z')
+                    $lte: moment('2024-02-25T00:00:00Z')
                         .toDate()
                 }
             },
@@ -82,62 +82,66 @@ async function main() {
                 'deleting person...',
                 personId, deletingOwnershipInfo.project.id, deletingOwnershipInfo.id, deletingOwnershipInfo.ownedFrom, i
             );
-            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
+            try {
+                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'
                         },
-                        movieticketReserve: {
-                            timeout: 1000,
-                            timeoutCheck: 1000,
-                            minIntervalBetweenPayAndRefund: 1000,
-                            credentialsExpireInSeconds: 1000
-                        },
-                        useExperimentalFeature: false
-                    }),
-                    credentials: <any>{}
-                },
-                {
-                    executeById: false,
-                    executeByName: true
-                }
-            );
-            console.log(
-                'deleted',
-                personId, deletingOwnershipInfo.project.id, deletingOwnershipInfo.id, deletingOwnershipInfo.ownedFrom, i
-            );
+                        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
+                    }
+                );
+                console.log(
+                    'deleted',
+                    personId, deletingOwnershipInfo.project.id, deletingOwnershipInfo.id, deletingOwnershipInfo.ownedFrom, i
+                );
+            } catch (error) {
+                // no op
+            }
         });
 
         console.log(i, 'docs checked');

package/example/src/chevre/upsertManyEventsByAdditionalProperty.ts

@@ -179,8 +179,7 @@ async function main() {
         },
         screeningRoom: {
             branchCode: '10'
-        },
-        options: { updateOffersSeller: false }
+        }
     });
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

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

@@ -80,6 +80,11 @@ type IKeyOfProjection4minimizedEvent<T extends AvailableEventType> = T extends f
 type IUnset<T extends AvailableEventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
+type IEvent4updateManyByAdditionalProperty = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'project' | 'typeOf'> & {
+    offers: {
+        seller: Pick<factory.event.screeningEvent.ISeller, 'makesOffer'>;
+    };
+};
 /**
  * イベントリポジトリ
  */
@@ -116,8 +121,28 @@ export declare class EventRepo {
              */
             branchCode: string;
         };
-        options: {
-            updateOffersSeller: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
+    /**
+     * 特定の追加特性をキーにして、イベントを更新する
+     * イベントは既に存在する前提(insertしない)
+     * 施設コンテンツは1つに限定
+     * 特定の属性のみ更新する
+     */
+    updateManyByAdditionalProperty(params: {
+        events: IEvent4updateManyByAdditionalProperty[];
+        additionalPropertyFilter: {
+            name: string;
+        };
+        eventSeries: {
+            /**
+             * 施設コンテンツID
+             */
+            id: string;
         };
     }): Promise<{
         bulkWriteResult: BulkWriteResult;

package/lib/chevre/repo/event.js

@@ -390,7 +390,6 @@ class EventRepo {
     // tslint:disable-next-line:max-func-body-length
     upsertManyByAdditionalProperty(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { updateOffersSeller } = params.options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const additionalProperties = [];
@@ -406,9 +405,10 @@ class EventRepo {
                         throw new factory.errors.ArgumentNull('additionalProperty.value');
                     }
                     additionalProperties.push({ name: additionalPropertyFilter.name, value: additionalPropertyValue });
-                    const { coaInfo, // ←適用しない
+                    const { coaInfo, identifier, // ←適用しない
                     maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
-                    eventStatus, superEvent, offers } = creatingEventParams, setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent", "offers"]);
+                    eventStatus, superEvent } = creatingEventParams, // <-上書き可能な属性を限定的に
+                    setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "identifier", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
                     if (superEvent.id !== eventSeries.id) {
                         throw new factory.errors.Argument('superEvent.id', 'superEvent.id not matched');
                     }
@@ -426,23 +426,17 @@ class EventRepo {
                         },
                         'superEvent.id': { $exists: true, $eq: superEvent.id } // add superEvent.id(2024-09-15~)
                     };
-                    let setOnInsert;
-                    if (updateOffersSeller) {
-                        setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, setOnInsertFields), { 'offers.typeOf': offers.typeOf, 'offers.eligibleQuantity': offers.eligibleQuantity, 'offers.itemOffered': offers.itemOffered }), (offers.offeredThrough !== undefined) ? { 'offers.offeredThrough': offers.offeredThrough } : undefined), (offers.unacceptedPaymentMethod !== undefined)
-                            ? { 'offers.unacceptedPaymentMethod': offers.unacceptedPaymentMethod }
-                            : undefined), { _id: uniqid() });
-                    }
-                    else {
-                        setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { offers, _id: uniqid() });
-                    }
+                    const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() });
                     bulkWriteOps.push({
                         updateOne: {
                             filter,
                             update: {
                                 $setOnInsert: setOnInsert,
                                 // 変更可能な属性のみ上書き
-                                $set: Object.assign({ eventStatus,
-                                    superEvent }, (updateOffersSeller) ? { 'offers.seller': offers.seller } : undefined)
+                                $set: {
+                                    eventStatus,
+                                    superEvent // add superEvent(2024-09-15~)
+                                }
                             },
                             upsert: true
                         }
@@ -461,13 +455,77 @@ class EventRepo {
                     _id: 0,
                     id: { $toString: '$_id' }
                 })
-                    // .select(['_id'])
                     .lean() // lean(2024-09-15~)
                     .exec();
                 return { bulkWriteResult, modifiedEvents };
             }
         });
     }
+    /**
+     * 特定の追加特性をキーにして、イベントを更新する
+     * イベントは既に存在する前提(insertしない)
+     * 施設コンテンツは1つに限定
+     * 特定の属性のみ更新する
+     */
+    // tslint:disable-next-line:max-func-body-length
+    updateManyByAdditionalProperty(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            const additionalProperties = [];
+            const { events, additionalPropertyFilter, eventSeries } = params;
+            if (Array.isArray(events)) {
+                events.forEach((creatingEventParams) => {
+                    var _a, _b;
+                    if (creatingEventParams.typeOf !== factory.eventType.ScreeningEvent) {
+                        throw new factory.errors.NotImplemented(`only ${factory.eventType.ScreeningEvent} implemented`);
+                    }
+                    const additionalPropertyValue = (_b = (_a = creatingEventParams.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === additionalPropertyFilter.name)) === null || _b === void 0 ? void 0 : _b.value;
+                    if (typeof additionalPropertyValue !== 'string' || additionalPropertyValue === '') {
+                        throw new factory.errors.ArgumentNull('additionalProperty.value');
+                    }
+                    additionalProperties.push({ name: additionalPropertyFilter.name, value: additionalPropertyValue });
+                    const { offers // <-上書き可能な属性を限定的に
+                     } = creatingEventParams;
+                    const filter = {
+                        typeOf: { $eq: creatingEventParams.typeOf },
+                        'project.id': { $eq: creatingEventParams.project.id },
+                        additionalProperty: {
+                            $exists: true,
+                            $all: [{ name: additionalPropertyFilter.name, value: additionalPropertyValue }]
+                        },
+                        'superEvent.id': { $exists: true, $eq: eventSeries.id }
+                    };
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter,
+                            update: {
+                                $set: {
+                                    'offers.seller.makesOffer': offers.seller.makesOffer
+                                }
+                            },
+                            upsert: false
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = yield this.eventModel.find({
+                    typeOf: { $eq: params.events[0].typeOf },
+                    'project.id': { $eq: params.events[0].project.id },
+                    additionalProperty: { $exists: true, $in: additionalProperties },
+                    'superEvent.id': { $exists: true, $eq: eventSeries.id } // add superEvent.id(2024-09-15~)
+                }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedEvents };
+            }
+        });
+    }
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -1,3 +1,4 @@
+import type { Algorithm } from 'jsonwebtoken';
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
 interface IOnOrderStatusChanged {
@@ -82,6 +83,18 @@ export interface IJWTSetting {
     issuers: string[];
     version: string;
     payloadTypPrefix: string;
+    /**
+     * auth.apisによるトークン発行時のissuer
+     */
+    issuer: string;
+    /**
+     * auth.apisのトークン発行エンドポイント
+     */
+    issueEndpoint: string;
+    /**
+     * トークン署名アルゴリズム
+     */
+    algorithm: Algorithm;
 }
 export interface ISetting {
     defaultSenderEmail?: string;

package/lib/chevre/repo/setting/jwt.js

@@ -34,7 +34,7 @@ class JWTSettingRepo {
             if (jwtSetting === null || jwtSetting.jwt === undefined) {
                 throw new factory.errors.NotFound('setting.jwt');
             }
-            const { secret, version, payloadTypPrefix, issuers } = jwtSetting.jwt;
+            const { secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm } = jwtSetting.jwt;
             if (typeof secret !== 'string' || secret.length === 0) {
                 throw new factory.errors.NotFound('setting.jwt.secret');
             }
@@ -44,11 +44,20 @@ class JWTSettingRepo {
             if (typeof payloadTypPrefix !== 'string' || payloadTypPrefix.length === 0) {
                 throw new factory.errors.NotFound('setting.jwt.payloadTypPrefix');
             }
+            if (typeof issueEndpoint !== 'string' || issueEndpoint.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.issueEndpoint');
+            }
+            if (typeof issuer !== 'string' || issuer.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.issuer');
+            }
+            if (typeof algorithm !== 'string' || algorithm.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.algorithm');
+            }
             if (!Array.isArray(issuers)) {
                 throw new factory.errors.NotFound('setting.jwt.issuers');
             }
             return {
-                secret, version, payloadTypPrefix, issuers
+                secret, version, payloadTypPrefix, issuers, issueEndpoint, issuer, algorithm
             };
         });
     }

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

@@ -1,4 +1,3 @@
-import type { ActionRepo } from '../repo/action';
 import type { AuthorizationRepo } from '../repo/authorization';
 import type { JWTSettingRepo } from '../repo/setting/jwt';
 import type { TicketRepo } from '../repo/ticket';
@@ -9,7 +8,6 @@ interface IPayload extends Pick<factory.clientUser.IClientUser, 'aud' | 'exp' |
     typ: string;
     jti?: string;
 }
-type IAuthorizedObject = factory.authorization.IObject;
 /**
  * コードをトークンに変換する
  */
@@ -23,14 +21,6 @@ declare function getToken(params: {
     };
     code: string;
     expiresIn: number;
-    /**
-     * jtw.payload.iss
-     */
-    issuer: string;
-    /**
-     * jtw.payload.aud
-     */
-    audience: string;
 }): (repos: {
     authorization: AuthorizationRepo;
     jwtSetting: JWTSettingRepo;
@@ -38,19 +28,4 @@ declare function getToken(params: {
 }) => Promise<{
     token: IToken;
 }>;
-declare function verifyToken(params: {
-    project: {
-        id: string;
-    };
-    agent: factory.action.check.token.IAgent;
-    token: string;
-    audience?: string[];
-}): (repos: {
-    action?: ActionRepo;
-    authorization: AuthorizationRepo;
-    jwtSetting: JWTSettingRepo;
-    ticket: TicketRepo;
-}) => Promise<{
-    authorizedObject: IAuthorizedObject;
-}>;
-export { IPayload, getToken, verifyToken };
+export { IPayload, getToken };

package/lib/chevre/service/code.js

@@ -9,27 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken = exports.getToken = void 0;
+exports.getToken = void 0;
 /**
  * 承認サービス
  */
 const jwt = require("jsonwebtoken");
-// import { JWTCredentials } from '../credentials/jwt';
 const factory = require("../factory");
-const ALGORITHM = 'HS256';
 /**
  * コードをトークンに変換する
  */
 function getToken(params) {
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const credentials = {
-            jwt: yield repos.jwtSetting.findDefault()
-        };
+        const jwtSetting = yield repos.jwtSetting.findDefault();
         if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
             throw new factory.errors.ArgumentNull('project.id');
         }
@@ -40,38 +32,39 @@ function getToken(params) {
             project: { id: params.project.id },
             code: params.code
         });
-        if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
-            throw new factory.errors.ArgumentNull('issuer');
-        }
+        // if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
+        //     throw new factory.errors.ArgumentNull('issuer');
+        // }
         let subject;
         let typ;
-        let jti;
-        // let subject: string = authorization.id;
-        // let typ: string = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
         // jti必須化(2024-08-22~)
-        // let jti: string | undefined;
         const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
-        jti = id;
+        const jti = id;
         // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
         if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
             subject = authorization.object.member.id;
-            typ = `${credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
+            typ = `${jwtSetting.payloadTypPrefix}:${authorization.object.member.typeOf}`;
         }
         else {
             // useJtiの場合、subject,typはagent(2024-05-09~)
             subject = params.agent.id;
-            typ = `${credentials.jwt.payloadTypPrefix}:${params.agent.typeOf}`;
+            typ = `${jwtSetting.payloadTypPrefix}:${params.agent.typeOf}`;
         }
         const payload = {
-            // sub: authorization.id, // 拡張(2024-05-01~)
             token_use: 'access',
-            version: credentials.jwt.version,
+            version: jwtSetting.version,
             typ //  拡張(2024-05-07~)
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(payload, credentials.jwt.secret, Object.assign(Object.assign({ algorithm: ALGORITHM, issuer: params.issuer, expiresIn: params.expiresIn, subject }, (typeof params.audience === 'string') ? { audience: params.audience } : undefined), (typeof jti === 'string') ? { jwtid: jti } : undefined // 拡張(2024-05-08~)
-            ), (err, encoded) => {
+            jwt.sign(payload, jwtSetting.secret, {
+                algorithm: jwtSetting.algorithm,
+                issuer: jwtSetting.issuer,
+                expiresIn: params.expiresIn,
+                subject,
+                audience: jwtSetting.issuer,
+                jwtid: jti // 拡張(2024-05-08~)
+            }, (err, encoded) => {
                 if (err instanceof Error) {
                     reject(err);
                 }
@@ -89,107 +82,3 @@ function getToken(params) {
     });
 }
 exports.getToken = getToken;
-function payload2authorizeObject(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { payload } = params;
-        let authorizedObject;
-        // token.payloadが承認のケースに対応(2024-05-02~)
-        if (typeof payload.version === 'string') {
-            if (typeof payload.sub !== 'string' || payload.sub.length === 0) {
-                throw new factory.errors.Unauthorized(`invalid token [sub:${payload.sub}]`);
-            }
-            if (typeof payload.jti === 'string') {
-                // jtiに対応(2024-05-08~)
-                const ticket = (yield repos.ticket.projectFields({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.project.id } },
-                    id: { $eq: payload.jti }
-                }, ['ticketToken'])).shift();
-                if (ticket === undefined) {
-                    throw new factory.errors.NotFound('Ticket');
-                }
-                // 承認を参照
-                const { object } = yield repos.authorization.findValidOneByCode({
-                    project: { id: params.project.id },
-                    code: ticket.ticketToken
-                });
-                authorizedObject = object;
-            }
-            else {
-                // 基本的にはsubで承認を参照
-                const { object } = yield repos.authorization.findValidOneById({
-                    project: { id: params.project.id },
-                    id: payload.sub
-                });
-                authorizedObject = object;
-            }
-        }
-        else {
-            // NO_VERSIONを廃止(2024-05-06~)
-            throw new factory.errors.NotImplemented('USE_TOKEN_WITH_NO_VERSION discontinued');
-        }
-        return { authorizedObject };
-    });
-}
-function verifyToken(params) {
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        let payload;
-        let action;
-        if (repos.action !== undefined) {
-            const actionAttributes = {
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                typeOf: factory.actionType.CheckAction,
-                agent: params.agent,
-                object: {
-                    token: params.token,
-                    typeOf: factory.action.check.token.ObjectType.Ticket
-                }
-            };
-            action = yield repos.action.start(actionAttributes);
-        }
-        try {
-            const credentials = {
-                jwt: yield repos.jwtSetting.findDefault()
-            };
-            // payload = await new Promise<IPayloadWithNoVersion | IPayload>((resolve, reject) => {
-            payload = yield new Promise((resolve, reject) => {
-                jwt.verify(params.token, credentials.jwt.secret, Object.assign({ algorithms: [ALGORITHM], 
-                    // 互換性維持のために複数対応(2024-05-02~)
-                    // issuer: credentials.jwt.issuer,
-                    issuer: credentials.jwt.issuers }, (Array.isArray(params.audience)) ? { audience: params.audience } : undefined), (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(decoded);
-                    }
-                });
-            });
-        }
-        catch (error) {
-            if (repos.action !== undefined && action !== undefined) {
-                try {
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-                }
-                catch (__) {
-                    // 失敗したら仕方ない
-                }
-            }
-            // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('token', `${error.message} expiredAt:${error.expiredAt}`);
-            }
-            throw error;
-        }
-        if (repos.action !== undefined && action !== undefined) {
-            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: payload });
-        }
-        return payload2authorizeObject({ payload, project: { id: params.project.id } })(repos);
-    });
-}
-exports.verifyToken = verifyToken;

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const GMO = require("@motionpicture/gmo-service");
+const createDebug = require("debug");
 const factory = require("../../factory");
 // import { Settings } from '../../settings';
 const person2username_1 = require("../payment/any/person2username");
@@ -23,6 +24,7 @@ const person_1 = require("../../repo/person");
 const project_1 = require("../../repo/project");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
+const debug = createDebug('chevre-domain:service:task:deletePerson');
 const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 'CreditCard';
 let cognitoIdentityServiceProvider;
 /**
@@ -129,8 +131,7 @@ function deleteById(params, setting) {
                 })({ task: repos.task });
             }
             existingPeople = yield repos.newPerson.search({ id: params.id });
-            // tslint:disable-next-line:no-console
-            console.log('admin:people:deleteById: existingPeople:', JSON.stringify(existingPeople));
+            debug('admin:people:deleteById: existingPeople:', JSON.stringify(existingPeople));
             if (existingPeople.length > 0) {
                 // クレジットカード削除
                 yield deleteCreditCardsById({
@@ -145,8 +146,7 @@ function deleteById(params, setting) {
                 );
             }
             // 所有権削除
-            // tslint:disable-next-line:no-console
-            console.log('admin:people:deleteById: deleteOwnershipInfosById processing... personId:', params.id);
+            debug('admin:people:deleteById: deleteOwnershipInfosById processing... personId:', params.id);
             yield deleteOwnershipInfosById({
                 id: params.id,
                 project: { id: project.id }
@@ -154,8 +154,7 @@ function deleteById(params, setting) {
             if (existingPeople.length > 0) {
                 // 会員削除
                 if (params.physically === true) {
-                    // tslint:disable-next-line:no-console
-                    console.log('admin:people:deleteById: deleteById processing...userId:', params.id);
+                    debug('admin:people:deleteById: deleteById processing...userId:', params.id);
                     yield repos.newPerson.deleteById({ userId: params.id });
                 }
                 else {
@@ -404,8 +403,7 @@ function deleteCreditCardsById(params, setting) {
                         let throwsPerson2usernameError = true;
                         // oldUserが存在しないケースをハンドル
                         if (error instanceof factory.errors.NotFound && error.entityName === 'User') {
-                            // tslint:disable-next-line:no-console
-                            console.log('admin:people:deleteById: deleteCreditCardsById oldUsername not found', 'personId:', params.id, 'numberOfTry:', numberOfTry);
+                            debug('admin:people:deleteById: deleteCreditCardsById oldUsername not found', 'personId:', params.id, 'numberOfTry:', numberOfTry);
                             throwsPerson2usernameError = false;
                         }
                         if (throwsPerson2usernameError) {
@@ -413,16 +411,14 @@ function deleteCreditCardsById(params, setting) {
                         }
                     }
                     if (typeof oldUsername === 'string') {
-                        // tslint:disable-next-line:no-console
-                        console.log('admin:people:deleteById: deleteCreditCardsById processing... oldUsername:', oldUsername, 'personId:', params.id, 'numberOfTry:', numberOfTry);
+                        debug('admin:people:deleteById: deleteCreditCardsById processing... oldUsername:', oldUsername, 'personId:', params.id, 'numberOfTry:', numberOfTry);
                         yield repos.creditCard.deleteAll({ personId: oldUsername });
                     }
                 }
                 else {
                     yield repos.creditCard.deleteAll({ personId: params.id });
                 }
-                // tslint:disable-next-line:no-console
-                console.log('admin:people:deleteById: deleteCreditCardsById processed. personId:', params.id, 'numberOfTry:', numberOfTry);
+                debug('admin:people:deleteById: deleteCreditCardsById processed. personId:', params.id, 'numberOfTry:', numberOfTry);
                 break;
             }
             catch (error) {

package/package.json

@@ -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.16"
+  "version": "22.7.0-alpha.17"
 }