@chevre/domain 22.14.0-alpha.9 → 23.0.0-alpha.1

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

@@ -25,7 +25,7 @@ const schemaDefinition = {
     description: mongoose_1.SchemaTypes.Mixed,
     address: mongoose_1.SchemaTypes.Mixed,
     branchCode: { type: String, required: true },
-    containedInPlace: mongoose_1.SchemaTypes.Mixed,
+    containedInPlace: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     containsPlace: [mongoose_1.SchemaTypes.Mixed],
     maximumAttendeeCapacity: Number,
     openingHoursSpecification: mongoose_1.SchemaTypes.Mixed,
@@ -170,20 +170,19 @@ const indexes = [
                 'containedInPlace.branchCode': { $exists: true }
             }
         }
+    ],
+    [
+        // unique index(2025-10-01~)
+        {
+            // 'project.id': 1,
+            'containedInPlace.id': 1, // 施設内ユニーク
+            branchCode: 1
+        },
+        {
+            unique: true,
+            name: 'uniqueBranchCode'
+        }
     ]
-    // [
-    //     {
-    //         typeOf: 1,
-    //         'project.id': 1,
-    //         'containedInPlace.branchCode': 1,
-    //         branchCode: 1,
-    //         'containsPlace.branchCode': 1,
-    //         'containsPlace.containsPlace.branchCode': 1
-    //     },
-    //     {
-    //         name: 'projectSeatsUsingSort'
-    //     }
-    // ]
 ];
 exports.indexes = indexes;
 /**

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

@@ -50,10 +50,10 @@ const indexes = [
         { productID: 1 },
         { name: 'searchByProductID' }
     ],
-    [
-        { 'project.id': 1, productID: 1 },
-        { name: 'searchByProjectId-v20220721' }
-    ],
+    // [
+    //     { 'project.id': 1, productID: 1 },
+    //     { name: 'searchByProjectId-v20220721' }
+    // ], // migrate to uniqueProductID(2025-09-30~)
     [
         { 'hasOfferCatalog.id': 1, productID: 1 },
         {
@@ -129,6 +129,16 @@ const indexes = [
                 additionalProperty: { $exists: true }
             }
         }
+    ],
+    [
+        {
+            'project.id': 1,
+            productID: 1
+        },
+        {
+            name: 'uniqueProductID',
+            unique: true
+        }
     ]
 ];
 exports.indexes = indexes;

package/lib/chevre/repo/mongoose/schemas/{offer/event.d.ts → productOffer.d.ts}

@@ -1,10 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import * as factory from '../../../../factory';
-type IDocType = factory.eventOffer.IEventOfferForMemberTier;
+import * as factory from '../../../factory';
+type IDocType = Omit<factory.productOffer.IProductOffer, 'acceptedPaymentMethod' | 'validForMemberTier'> & {
+    acceptedPaymentMethod?: factory.productOffer.IAcceptedPaymentMethod;
+    validForMemberTier?: factory.productOffer.IValidForMemberTier;
+};
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
-declare const modelName = "Offer.Event";
+declare const modelName = "ProductOffer";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
 export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/{offer/event.js → productOffer.js}

@@ -3,25 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
-const settings_1 = require("../../../../settings");
-const writeConcern_1 = require("../../writeConcern");
-const modelName = 'Offer.Event';
+const settings_1 = require("../../../settings");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'ProductOffer';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     identifier: { type: String, required: true },
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    availableAtOrFrom: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    offeredBy: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    availability: { type: String, required: true },
     validFrom: { type: Date, required: true },
     validThrough: { type: Date, required: true },
-    validForMemberTier: { type: mongoose_1.SchemaTypes.Mixed, required: true }
+    // availableAtOrFrom: { type: SchemaTypes.Mixed, required: false },
+    validForMemberTier: { type: mongoose_1.SchemaTypes.Mixed, required: false },
+    acceptedPaymentMethod: { type: mongoose_1.SchemaTypes.Mixed, required: false }
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
     autoCreate: false,
-    collection: 'offers.event',
+    collection: 'productOffers',
     id: true,
     read: settings_1.MONGO_READ_PREFERENCE,
     writeConcern: writeConcern_1.writeConcern,
@@ -49,7 +51,8 @@ const indexes = [
     ],
     [
         {
-            'itemOffered.id': 1,
+            'project.id': 1,
+            'itemOffered.identifier': 1,
             identifier: 1
         },
         {
@@ -57,45 +60,39 @@ const indexes = [
             unique: true
         }
     ],
-    [
-        {
-            'itemOffered.id': 1,
-            'availableAtOrFrom.id': 1,
-            'validForMemberTier.identifier': 1
-        },
-        {
-            name: 'uniqueByItemOfferedAndAvailableAt',
-            unique: true
-        }
-    ],
     [
         { 'project.id': 1, validFrom: 1 },
         { name: 'projectId' }
     ],
-    [
-        { 'seller.id': 1, validFrom: 1 },
-        { name: 'sellerId' }
-    ],
     [
         { identifier: 1, validFrom: 1 },
         { name: 'identifier' }
     ],
     [
-        { 'itemOffered.id': 1, validFrom: 1 },
-        { name: 'itemOfferedId' }
+        { 'itemOffered.identifier': 1, validFrom: 1 },
+        { name: 'itemOfferedIdentifier' }
+    ],
+    [
+        { 'offeredBy.id': 1, validFrom: 1 },
+        { name: 'offeredById' }
     ],
     [
-        { 'availableAtOrFrom.id': 1, validFrom: 1 },
-        { name: 'availableAtOrFromId' }
+        { validThrough: 1, validFrom: 1 },
+        { name: 'validThrough' }
     ],
     [
         { 'validForMemberTier.identifier': 1, validFrom: 1 },
-        { name: 'validForMemberTierIdentifier' }
+        {
+            name: 'validForMemberTierIdentifier',
+            partialFilterExpression: {
+                'validForMemberTier.identifier': { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;
 /**
- * イベントオファー(クライアントごとの有効期間)スキーマ
+ * プロダクトオファー(汎用的なオファー設定)スキーマ
  */
 let schema;
 function createSchema() {

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

@@ -57,12 +57,12 @@ const indexes = [
         { typeOf: 1, branchCode: 1 },
         { name: 'searchByTypeOf' }
     ],
-    [
-        { 'project.id': 1, branchCode: 1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
-    ],
+    // [
+    //     { 'project.id': 1, branchCode: 1 },
+    //     {
+    //         name: 'searchByProjectId-v20220721'
+    //     }
+    // ],
     [
         { 'name.ja': 1, branchCode: 1 },
         {
@@ -107,6 +107,17 @@ const indexes = [
                 'hasMerchantReturnPolicy.identifier': { $exists: true }
             }
         }
+    ],
+    [
+        // unique index(2025-10-01~)
+        {
+            'project.id': 1,
+            branchCode: 1
+        },
+        {
+            unique: true,
+            name: 'uniqueBranchCode'
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -1,77 +1,52 @@
-import { Connection } from 'mongoose';
+import type { BulkWriteResult, DeleteResult } from 'mongodb';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/productOffer';
+type IUnset = {
+    [key in keyof IDocType]?: 1;
+};
+type IDocWithId = factory.productOffer.IProductOffer & {
+    id: string;
+};
+type IKeyOfProjection = keyof IDocType;
 /**
  * プロダクトオファーリポジトリ
  */
 export declare class ProductOfferRepo {
-    private readonly productModel;
+    private readonly productOfferModel;
     constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.productOffer.ISearchConditions): FilterQuery<IDocType>[];
+    findProductOffers(params: factory.productOffer.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
     /**
-     * プロダクトオファー検索
+     * オファーコードとオファーコレクションコードをキーにして冪等置換
      */
-    search(params: {
-        limit?: number;
-        page?: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        itemOffered?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        seller?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-    }): Promise<(Pick<factory.product.IOffer, 'availabilityEnds' | 'availabilityStarts' | 'seller' | 'validFrom' | 'validThrough'> & {
-        itemOffered: Pick<factory.product.IProduct, 'id' | 'name' | 'typeOf'>;
-    })[]>;
-    create(params: factory.product.IOffer & {
-        project: {
-            id: string;
-        };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
+    upsertOffersByIdentifier(params: {
+        $set: Pick<IDocType, 'acceptedPaymentMethod' | 'availability' | 'identifier' | 'itemOffered' | 'offeredBy' | 'project' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
+            id?: never;
+        };
+        $unset: IUnset;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
     }): Promise<{
-        id: string;
-    }>;
-    update(params: factory.product.IOffer & {
-        project: {
+        bulkWriteResult: BulkWriteResult;
+        modifiedProductOffers: {
             id: string;
-        };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    deleteOne(params: Pick<factory.product.IOffer, 'seller'> & {
+        }[];
+    } | void>;
+    /**
+     * 販売者の提供するプロダクトオファーを削除する
+     */
+    deleteProductOffersBySeller(params: {
         project: {
             id: string;
         };
-        itemOffered: {
-            /**
-             * プロダクトID
-             */
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    deleteManyBySellerId(params: Pick<factory.product.IOffer, 'seller'> & {
-        project: {
+        offeredBy: {
             id: string;
         };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    }): Promise<DeleteResult>;
 }
+export {};