@chevre/domain 22.2.0-alpha.20 → 22.2.0-alpha.22

package/example/src/chevre/findValidAuthorization.ts

@@ -31,8 +31,7 @@ async function main() {
         code: CODE,
         expiresIn: 18000,
         issuer: 'https://example.com',
-        audience: 'https://example.com',
-        useJti: true
+        audience: 'https://example.com'
     })(
         {
             authorization: authorizationRepo,

package/example/src/chevre/projectFields.ts

@@ -3,7 +3,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const project = { id: String(process.env.PROJECT_ID) };
+// const project = { id: String(process.env.PROJECT_ID) };
 
 mongoose.Model.on('index', (...args) => {
     console.error('******** index event emitted. ********\n', args);
@@ -12,16 +12,14 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
-    const docs = await sellerRepo.projectFields(
+    const docs = await roleRepo.projectFields(
         {
             limit: 1,
             page: 1,
-            project: { id: { $eq: project.id } }
-        },
-        [],
-        ['hasMerchantReturnPolicy', 'makesOffer', 'additionalProperty']
+            roleName: { $eq: 'customer' }
+        }
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

package/example/src/chevre/searchProjects.ts

@@ -3,29 +3,34 @@ 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 projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
 
     const project = await projectRepo.findById({
-        id: 'xxx',
+        id: PROJECT_ID,
         inclusion: [],
-        exclusion: ['settings']
+        exclusion: ['settings', 'hasMerchantReturnPolicy']
     });
     console.log('project:', project);
 
-    const projects = await projectRepo.search(
+    const projects = await projectRepo.projectFields(
         {
             limit: 1,
             page: 1,
             id: { $eq: project.id }
         },
-        ['_id', 'name'],
+        ['typeOf'],
         []
     );
     console.log(projects);
     console.log(projects.length, 'projects found');
+
+    const findAlternateNameByIdReulst = await projectRepo.findAlternateNameById({ id: project.id });
+    console.log('findAlternateNameByIdReulst:', findAlternateNameByIdReulst);
 }
 
 main()

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,23 +6,10 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await productRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await sellerRepo.unsetUnnecessaryFields({
+    updateResult = await categoryCodeRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },

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

@@ -83,5 +83,9 @@ export declare class CategoryCodeRepo {
         };
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.categoryCode.ICategoryCode>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.categoryCode.ICategoryCode>;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/categoryCode.js

@@ -344,5 +344,11 @@ class CategoryCodeRepo {
             .sort({ codeValue: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.categoryCodeModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.CategoryCodeRepo = CategoryCodeRepo;

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "CategoryCode";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

package/lib/chevre/repo/mongoose/schemas/categoryCode.js

@@ -22,6 +22,9 @@ const schemaDefinition = {
     inCodeSet: mongoose_1.SchemaTypes.Mixed,
     name: mongoose_1.SchemaTypes.Mixed,
     paymentMethod: mongoose_1.SchemaTypes.Mixed
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -32,10 +35,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -49,26 +50,7 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * カテゴリーコードスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { codeValue: 1 },
         {
@@ -128,3 +110,19 @@ const indexes = [
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 区分スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.project.IProject | '_id';
+type IKeyOfProjection = keyof factory.project.IProject;
 /**
  * プロジェクトリポジトリ
  * makesOfferについてはsee ProjectMakesOfferRepo
@@ -44,9 +44,9 @@ export declare class ProjectRepo {
     /**
      * プロジェクト検索
      */
-    search(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
-    createById(params: factory.project.IProject): Promise<factory.project.IProject>;
-    findByIdAndIUpdate(params: {
+    projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
+    createById(params: factory.project.IProject): Promise<Pick<factory.project.IProject, 'id'>>;
+    updateById(params: {
         id: string;
         alternateName?: string;
         logo?: string;

package/lib/chevre/repo/project.js

@@ -8,11 +8,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepo = void 0;
 const project_1 = require("./mongoose/schemas/project");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    // 'aggregateReservation',
+    'alternateName',
+    'logo',
+    'hasMerchantReturnPolicy',
+    // 'makesOffer',
+    'name',
+    'settings',
+    'subscription',
+    'typeOf'
+];
 /**
  * プロジェクトリポジトリ
  * makesOfferについてはsee ProjectMakesOfferRepo
@@ -43,7 +65,7 @@ class ProjectRepo {
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const project = (yield this.search({
+            const project = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: params.id }
@@ -56,42 +78,52 @@ class ProjectRepo {
     }
     findAlternateNameById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1 })
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1, _id: 0 })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
      * プロジェクト検索
      */
-    search(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProjectRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    if (String(field) !== 'makesOffer') {
-                        projection[field] = 1;
-                    }
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0,
-                    makesOffer: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         if (String(field) !== 'makesOffer') {
+            //             projection[field] = 1;
+            //         }
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0,
+            //         makesOffer: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.projectModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -102,17 +134,28 @@ class ProjectRepo {
                 query.sort({ _id: conditions.sort._id });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-22~
+                .exec();
         });
     }
     createById(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.projectModel.create(Object.assign(Object.assign({}, params), { _id: params.id }))
-                .then((doc) => doc.toObject());
+            // return this.projectModel.create({ ...params, _id: params.id })
+            //     .then((doc) => doc.toObject());
+            const { id } = params, createParams = __rest(params, ["id"]);
+            if (typeof id !== 'string' || id === '') {
+                throw new factory.errors.ArgumentNull('id');
+            }
+            const result = yield this.projectModel.insertMany(Object.assign(Object.assign({}, createParams), { typeOf: factory.organizationType.Project, _id: id }), { rawResult: true });
+            const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`project not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            return { id: insertedId };
         });
     }
-    findByIdAndIUpdate(params) {
+    updateById(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             let hasMerchantReturnPolicy;
@@ -136,7 +179,7 @@ class ProjectRepo {
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), (hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)
-                } }))
+                } }), { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -153,9 +196,7 @@ class ProjectRepo {
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.deleteOne({
-                _id: { $eq: params.id }
-            })
+            yield this.projectModel.deleteOne({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -1,13 +1,6 @@
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-export declare enum RoleType {
-    OrganizationRole = "OrganizationRole"
-}
-export interface IRole {
-    typeOf: RoleType;
-    roleName: string;
-    permissions: string[];
-}
+export type IRole = Pick<factory.iam.IRole, 'permissions' | 'roleName' | 'typeOf'>;
 /**
  * IAMロールリポジトリ
  */
@@ -15,7 +8,7 @@ export declare class RoleRepo {
     private readonly roleModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.IRoleSearchConditions): any[];
-    search(params: factory.iam.IRoleSearchConditions): Promise<IRole[]>;
+    projectFields(params: factory.iam.IRoleSearchConditions): Promise<IRole[]>;
     aggregatePermissions(params: {
         roleName: {
             $in: string[];

package/lib/chevre/repo/role.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleRepo = exports.RoleType = void 0;
-const role_1 = require("./mongoose/schemas/role");
+exports.RoleRepo = void 0;
 const settings_1 = require("../settings");
-var RoleType;
-(function (RoleType) {
-    RoleType["OrganizationRole"] = "OrganizationRole";
-})(RoleType = exports.RoleType || (exports.RoleType = {}));
+const role_1 = require("./mongoose/schemas/role");
+const AVAILABLE_PROJECT_FIELDS = [
+    'typeOf',
+    'permissions',
+    'roleName'
+];
 /**
  * IAMロールリポジトリ
  */
@@ -39,10 +40,19 @@ class RoleRepo {
         }
         return andConditions;
     }
-    search(params) {
+    projectFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, {});
+            const positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            // } else {
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+            //     }
+            // }
+            const projection = Object.assign({ _id: 0 }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -56,8 +66,8 @@ class RoleRepo {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-23~
+                .exec();
         });
     }
     aggregatePermissions(params) {

package/lib/chevre/service/aggregation/project.js

@@ -23,7 +23,7 @@ function aggregate(params) {
         // 集計対象プロジェクト検索
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         // 予約集計

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

@@ -85,7 +85,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
@@ -141,7 +141,7 @@ function startAndConfirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);

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

@@ -27,7 +27,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'typeOf'],
+            inclusion: ['typeOf'],
             exclusion: []
         });
         // objectはオファー

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

@@ -35,10 +35,6 @@ declare function getToken(params: {
      * jtw.payload.aud
      */
     audience: string;
-    /**
-     * payload.jtiを使用するかどうか
-     */
-    useJti: boolean;
 }): (repos: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;

package/lib/chevre/service/code.js

@@ -39,22 +39,26 @@ function getToken(params) {
         if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
             throw new factory.errors.ArgumentNull('issuer');
         }
-        let subject = authorization.id;
-        let typ = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
+        let subject;
+        let typ;
         let jti;
-        if (params.useJti) {
-            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;
-            // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
-            if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
-                subject = authorization.object.member.id;
-                typ = `${credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
-            }
-            else {
-                // useJtiの場合、subject,typはagent(2024-05-09~)
-                subject = params.agent.id;
-                typ = `${credentials.jwt.payloadTypPrefix}:${params.agent.typeOf}`;
-            }
+        // let subject: string = authorization.id;
+        // let typ: string = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
+        // jti必須化(2024-08-22~)
+        // let jti: string | undefined;
+        // if (params.useJti) {
+        // }
+        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;
+        // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
+        if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
+            subject = authorization.object.member.id;
+            typ = `${credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
+        }
+        else {
+            // useJtiの場合、subject,typはagent(2024-05-09~)
+            subject = params.agent.id;
+            typ = `${credentials.jwt.payloadTypPrefix}:${params.agent.typeOf}`;
         }
         const payload = {
             // sub: authorization.id, // 拡張(2024-05-01~)

package/lib/chevre/service/moneyTransfer.js

@@ -24,7 +24,7 @@ function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'settings', 'typeOf'],
+            inclusion: ['settings', 'typeOf'],
             exclusion: []
         });
         const transaction = yield repos.assetTransaction.findById({

package/lib/chevre/service/notification.js

@@ -30,7 +30,7 @@ function sendEmailMessage(params) {
         var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
-            inclusion: ['_id', 'settings'],
+            inclusion: ['settings'],
             exclusion: []
         });
         const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -4,7 +4,7 @@ declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     event: {
         id: string;
     };
@@ -26,13 +26,13 @@ declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
 declare function acceptedOffers2authorizeResult(params: {
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
     ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
+export type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     reservationFor: factory.assetTransaction.reserve.IReservationFor;

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -17,8 +17,9 @@ import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
+import { IResultAcceptedOffer } from './factory';
 declare function processStartReserve4chevre(params: {
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber: string;
@@ -57,6 +58,6 @@ declare function processStartReserve4chevre(params: {
 }, credentials: {
     jwt: JWTCredentials;
 }) => Promise<{
-    acceptedOffers4result: factory.action.authorize.offer.eventService.IResultAcceptedOffer[];
+    acceptedOffers4result: IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -48,7 +48,7 @@ type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, credentials: {
     jwt: JWTCredentials;
 }) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
-type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.Chevre>;
+type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {
     /**
      * オファーID指定なしに座席をおさえる場合true

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.d.ts

@@ -10,12 +10,12 @@ export interface IAppliesToSurfrock {
     };
 }
 export declare function createAcceptedOffersWithoutDetails(params: {
-    object: factory.action.authorize.offer.eventService.IObjectWithoutDetail<WebAPIIdentifier.COA>;
+    object: factory.action.accept.coaOffer.IObjectWithoutDetail4COA;
     coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>;
 }): (repos: {
     reserveService: COA.service.Reserve;
 }) => Promise<IAcceptedOfferWithoutDetail[]>;
-type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
+type IAcceptedOfferBeforeAuthorize4COA = factory.action.accept.coaOffer.IAcceptedOfferBeforeAuthorize4COA;
 export declare function validateOffers(coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>, offers: IAcceptedOfferWithoutDetail[], appliesToSurfrock: IAppliesToSurfrock, flgMember: COA.factory.reserve.FlgMember): (repos: {
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/factory.d.ts

@@ -1,14 +1,14 @@
 import * as factory from '../../../../factory';
-type IAcceptedOfferWithoutDetail = factory.action.authorize.offer.eventService.IAcceptedOfferWithoutDetail<factory.service.webAPI.Identifier.COA> & {
+type IAcceptedOfferWithoutDetail = factory.action.accept.coaOffer.IAcceptedOfferWithoutDetail4COA & {
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
-    ticketInfo: factory.action.authorize.offer.eventService.ICOATicketInfo & {
+    ticketInfo: factory.action.accept.coaOffer.ICOATicketInfo & {
         spseatAdd1: number;
         spseatAdd2: number;
         spseatKbn: string;
     };
 };
 declare function createUpdTmpReserveSeatArgs(params: {
-    object: factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.COA>;
+    object: factory.action.accept.coaOffer.IObjectWithoutDetail4COA;
     coaInfo: Pick<factory.event.screeningEvent.ICOAInfo, 'dateJouei' | 'screenCode' | 'theaterCode' | 'timeBegin' | 'timeEnd' | 'titleBranchNum' | 'titleCode'>;
 }): factory.action.accept.coaOffer.IUpdTmpReserveSeatArgs;
 declare function processUpdTmpReserveSeatResult2recipe(params: {

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -6,8 +6,10 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { TransactionRepo } from '../../../repo/transaction';
+import { IRequestBody, IResponseBody } from './factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './validateAcceptedOffers';
 import * as factory from '../../../factory';
+export { IRequestBody, IResponseBody };
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
@@ -51,8 +53,8 @@ export declare function authorize(params: {
         id: string;
     };
     result: {
-        requestBody: factory.action.authorize.offer.eventService.IRequestBody<WebAPIIdentifier.COA>;
-        responseBody: factory.action.authorize.offer.eventService.IResponseBody<WebAPIIdentifier.COA>;
+        requestBody: IRequestBody;
+        responseBody: IResponseBody;
     };
     options: {};
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -1,12 +1,15 @@
+import type * as COAService from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAcceptedOffer4COA;
+export type IAcceptedOffer4COA = factory.action.accept.coaOffer.IAcceptedOffer4COA;
+export type IRequestBody = COAService.factory.reserve.IUpdTmpReserveSeatArgs;
+export type IResponseBody = COAService.factory.reserve.IUpdTmpReserveSeatResult;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    acceptedOffers: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: {
         id: string;
         typeOf: factory.eventType.ScreeningEvent;
@@ -21,13 +24,13 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
     eligibleMonetaryAmount: factory.offer.IEligibleMonetaryAmount[];
 };
-type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
 export declare function responseBody2acceptedOffers4result(params: {
-    responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
+    responseBody: IResponseBody;
+    acceptedOffer: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../../factory';
 import type { OfferRepo } from '../../../repo/offer';
 import { IAcceptedOffer4COA } from './factory';
-export type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.eventService.IAcceptedOfferBeforeAuthorize4COA;
+export type IAcceptedOfferBeforeAuthorize4COA = factory.action.accept.coaOffer.IAcceptedOfferBeforeAuthorize4COA;
 /**
  * 受け入れらたオファーの内容を検証
  */

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.12",
-    "@cinerino/sdk": "10.7.0-alpha.3",
+    "@chevre/factory": "4.381.0",
+    "@cinerino/sdk": "10.7.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.20"
+  "version": "22.2.0-alpha.22"
 }