@chevre/domain 28.0.0-alpha.16 → 28.0.0-alpha.18

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

@@ -1,7 +1,9 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = Omit<factory.seller.ISeller, 'id'>;
+type IDocType = Pick<factory.seller.ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'makesOffer' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
+    paymentAccepted?: factory.seller.IPaymentAccepted[];
+};
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

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

@@ -9,12 +9,10 @@ const modelName = 'Seller';
 exports.modelName = modelName;
 const schemaDefinition = {
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    // areaServed: [SchemaTypes.Mixed],
     branchCode: String,
     hasMerchantReturnPolicy: [mongoose_1.SchemaTypes.Mixed],
     makesOffer: [mongoose_1.SchemaTypes.Mixed],
     name: mongoose_1.SchemaTypes.Mixed,
-    // parentOrganization: SchemaTypes.Mixed,
     paymentAccepted: [mongoose_1.SchemaTypes.Mixed],
     project: mongoose_1.SchemaTypes.Mixed,
     typeOf: {

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

@@ -33,7 +33,7 @@ export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion: (keyof ISellerByAggregate)[]): Record<string, AnyExpression>;
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Record<string, AnyExpression>;
     /**
      * 販売者を保管する
      */
@@ -46,7 +46,10 @@ export declare class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
+    findSellersPublicFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions & {
+        limit: number;
+        page: number;
+    }, inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */
@@ -72,11 +75,15 @@ export declare class SellerRepo {
         id: string;
         makesOffer: factory.seller.IMakesOffer;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
+    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "project" | "name" | "typeOf" | "url" | "additionalProperty" | "telephone" | "branchCode" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+        paymentAccepted?: factory.seller.IPaymentAccepted[];
+    } & {
         _id: Types.ObjectId;
     } & {
         __v: number;
-    }, QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
+    }, QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "project" | "name" | "typeOf" | "url" | "additionalProperty" | "telephone" | "branchCode" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+        paymentAccepted?: factory.seller.IPaymentAccepted[];
+    } & {
         _id: Types.ObjectId;
     } & {
         __v: number;

package/lib/chevre/repo/seller.js

@@ -125,63 +125,38 @@ class SellerRepo {
                 'hasMerchantReturnPolicy.identifier': { $exists: true, $eq: hasMerchantReturnPolicyIdentifierEq }
             });
         }
-        // discontinue(2025-01-22~)
-        // const hasMerchantReturnApplicablePaymentMethodEq = params.hasMerchantReturnPolicy?.applicablePaymentMethod?.$eq;
-        // if (typeof hasMerchantReturnApplicablePaymentMethodEq === 'string') {
-        //     andConditions.push({
-        //         'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true, $eq: hasMerchantReturnApplicablePaymentMethodEq }
-        //     });
-        // }
-        // discontinue(2025-01-22~)
-        // const hasMerchantReturnPolicyItemConditionIdEq = params.hasMerchantReturnPolicy?.itemCondition?.id?.$eq;
-        // if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasMerchantReturnPolicy.itemCondition.id': {
-        //             $exists: true,
-        //             $eq: hasMerchantReturnPolicyItemConditionIdEq
-        //         }
-        //     });
-        // }
         return andConditions;
     }
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion) {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions) {
+        const inclusionMap = new Map(inclusions.map(inclusion => [inclusion, 1]));
         const projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
-            additionalProperty: '$additionalProperty',
-            branchCode: '$branchCode',
-            hasMerchantReturnPolicy: {
-                $cond: {
-                    if: { $isArray: '$hasMerchantReturnPolicy' },
-                    then: {
-                        $cond: {
-                            if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
-                            then: [],
-                            else: [{
-                                    url: { $first: '$hasMerchantReturnPolicy.url' }
-                                    // typeOf: { $first: '$hasMerchantReturnPolicy.typeOf' }
-                                }]
-                        }
-                    },
-                    else: []
+            ...((inclusionMap.get('additionalProperty') === 1) && { additionalProperty: '$additionalProperty' }),
+            ...((inclusionMap.get('branchCode') === 1) && { branchCode: '$branchCode' }),
+            ...((inclusionMap.get('name') === 1) && { name: '$name' }),
+            ...((inclusionMap.get('project') === 1) && { project: '$project' }),
+            ...((inclusionMap.get('typeOf') === 1) && { typeOf: '$typeOf' }),
+            ...((inclusionMap.get('url') === 1) && { url: '$url' }),
+            ...((inclusionMap.get('telephone') === 1) && { telephone: '$telephone' }),
+            ...((inclusionMap.get('hasMerchantReturnPolicy') === 1) && {
+                hasMerchantReturnPolicy: {
+                    $cond: {
+                        if: { $isArray: '$hasMerchantReturnPolicy' },
+                        then: {
+                            $cond: {
+                                if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
+                                then: [],
+                                else: [{
+                                        url: { $first: '$hasMerchantReturnPolicy.url' }
+                                    }]
+                            }
+                        },
+                        else: []
+                    }
                 }
-            },
-            name: '$name',
-            project: '$project',
-            typeOf: '$typeOf',
-            url: '$url',
-            telephone: '$telephone'
+            }),
         };
-        // if (inclusion.length > 0) {
-        //     // no op
-        // } else
-        if (exclusion.length > 0) {
-            exclusion.forEach((field) => {
-                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
-                    delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
-                }
-            });
-        }
         return projectStage;
     }
     /**
@@ -233,10 +208,10 @@ class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    async searchByAggregate(conditions, exclusion) {
+    async findSellersPublicFields(conditions, inclusions) {
         const matchStages = SellerRepo.CREATE_MONGO_CONDITIONS(conditions)
             .map((c) => ({ $match: c }));
-        const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion);
+        const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions);
         const sortByBranchCode = conditions.sort?.branchCode;
         const aggregate = this.sellerModel.aggregate([
             ...matchStages,
@@ -245,12 +220,10 @@ class SellerRepo {
                 : [],
             { $project: projectStage }
         ]);
-        /* istanbul ignore else */
-        if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-            const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-            aggregate.limit(conditions.limit * page)
-                .skip(conditions.limit * (page - 1));
-        }
+        const { limit, page } = conditions;
+        const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+        aggregate.skip(limit * (pageMustBePositive - 1))
+            .limit(limit);
         return aggregate.exec();
     }
     /**

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

@@ -26,7 +26,6 @@ const deleteResourcesByOfferCatalog_1 = require("./onResourceDeleted/deleteResou
 const deleteResourcesByProduct_1 = require("./onResourceDeleted/deleteResourcesByProduct");
 const deleteResourcesByRoom_1 = require("./onResourceDeleted/deleteResourcesByRoom");
 const deleteResourcesBySeller_1 = require("./onResourceDeleted/deleteResourcesBySeller");
-const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
 const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 /**
  * タスク実行関数
@@ -68,11 +67,12 @@ function onResourceDeleted(params) {
             if (useInform) {
                 switch (resourceType) {
                     case 'POS':
-                        await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
-                            project: { id: params.project.id },
-                            ids: [params.operator.id],
-                            typeOf: factory_1.factory.placeType.MovieTheater
-                        })(repos);
+                        // POS削除時通知は廃止(2026-09-26~)
+                        // await createInformHasPOSTasks({
+                        //     project: { id: params.project.id },
+                        //     ids: [params.operator.id],
+                        //     typeOf: factory.placeType.MovieTheater
+                        // })(repos);
                         break;
                     default:
                     // no op

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.d.ts

@@ -10,8 +10,12 @@ export declare function createInformHasPOSTasks(params: {
     /**
      * 施設ID
      */
-    ids: string[];
+    id: string;
     typeOf: factory.placeType.MovieTheater;
+    /**
+     * POSコード
+     */
+    branchCode: string;
 }): (repos: {
     pos: POSRepo;
     movieTheater: MovieTheaterRepo;

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -3,20 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformHasPOSTasks = createInformHasPOSTasks;
 const factory_1 = require("../../../factory");
 function createInformHasPOSTasks(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
-        if (params.ids.length !== 1) {
-            throw new factory_1.factory.errors.Argument('id', 'id.length must be 1');
-        }
+    return async (repos) => {
+        // if (params.ids.length !== 1) {
+        //     throw new factory.errors.Argument('id', 'id.length must be 1');
+        // }
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated']);
-        // const informResources = settings.onResourceUpdated.informResource;
         const informResources = setting?.onResourceUpdated?.informResource;
         const movieTheaters = await repos.movieTheater.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
-            id: { $eq: params.ids[0] }
+            id: { $eq: params.id }
         }, ['id']
         // []
         );
@@ -26,48 +23,53 @@ function createInformHasPOSTasks(params) {
         }
         // 施設のhasPOSを全て連携する
         repos.pos.operator.id = movieTheater.id;
-        const hasPOS = await repos.pos.findPOS({
-            projectId: params.project.id
-        }); // pos.idを除外(2026-09-18~)
-        const movieTheaters4inform = [{
-                hasPOS: (Array.isArray(hasPOS)) ? hasPOS : [],
-                id: movieTheater.id,
-                typeOf: factory_1.factory.placeType.MovieTheater
-            }];
-        if (movieTheaters4inform.length > 0) {
-            const taskRunsAt = new Date();
-            const informTasks = [];
-            informResources?.forEach((informResource) => {
-                const informUrl = String(informResource.recipient?.url);
-                movieTheaters4inform.forEach((movieTheater4inform) => {
-                    const informActionAttributes = {
-                        object: movieTheater4inform,
-                        recipient: {
-                            name: String(informResource.recipient?.name),
-                            typeOf: factory_1.factory.creativeWorkType.WebApplication
-                            // url: informUrl // discontinue(2025-02-13~)
-                        },
-                        target: {
-                            httpMethod: 'POST',
-                            encodingType: factory_1.factory.encodingFormat.Application.json,
-                            typeOf: 'EntryPoint',
-                            urlTemplate: informUrl
-                        }
-                    };
-                    informTasks.push({
-                        project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                        name: factory_1.factory.taskName.TriggerWebhook,
-                        status: factory_1.factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: informActionAttributes
+        const informingPOS = (await repos.pos.findPOS({
+            limit: 1,
+            page: 1,
+            projectId: params.project.id,
+            branchCode: { $eq: params.branchCode }
+        })).at(0); // pos.idを除外(2026-09-18~)
+        if (informingPOS !== undefined) {
+            const movieTheaters4inform = [{
+                    hasPOS: [informingPOS],
+                    id: movieTheater.id,
+                    typeOf: factory_1.factory.placeType.MovieTheater
+                }];
+            if (movieTheaters4inform.length > 0) {
+                const taskRunsAt = new Date();
+                const informTasks = [];
+                informResources?.forEach((informResource) => {
+                    const informUrl = String(informResource.recipient?.url);
+                    movieTheaters4inform.forEach((movieTheater4inform) => {
+                        const informActionAttributes = {
+                            object: movieTheater4inform,
+                            recipient: {
+                                name: String(informResource.recipient?.name),
+                                typeOf: factory_1.factory.creativeWorkType.WebApplication
+                                // url: informUrl // discontinue(2025-02-13~)
+                            },
+                            target: {
+                                httpMethod: 'POST',
+                                encodingType: factory_1.factory.encodingFormat.Application.json,
+                                typeOf: 'EntryPoint',
+                                urlTemplate: informUrl
+                            }
+                        };
+                        informTasks.push({
+                            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+                            name: factory_1.factory.taskName.TriggerWebhook,
+                            status: factory_1.factory.taskStatus.Ready,
+                            runsAt: taskRunsAt,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: informActionAttributes
+                        });
                     });
                 });
-            });
-            if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks);
+                if (informTasks.length > 0) {
+                    await repos.task.saveMany(informTasks);
+                }
             }
         }
     };

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

@@ -123,8 +123,9 @@ function onResourceUpdated(params) {
                     case 'POS':
                         await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
                             project: { id: params.project.id },
-                            ids: [params.operator.id],
-                            typeOf: factory_1.factory.placeType.MovieTheater
+                            id: params.operator.id,
+                            typeOf: factory_1.factory.placeType.MovieTheater,
+                            branchCode: params.branchCode
                         })(repos);
                         break;
                     case factory_1.factory.offerType.AggregateOffer:

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.4",
+    "@chevre/factory": "11.1.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.16"
+  "version": "28.0.0-alpha.18"
 }