@chevre/domain 22.14.0-alpha.23 → 22.14.0-alpha.24

package/lib/chevre/repo/event.js

@@ -753,13 +753,7 @@ class EventRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PUBLIC_PROJECT_FIELDS.includes(key));
                 projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
                 if (includeOffers) {
-                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 
-                        // 'offers.availabilityEnds': 1,
-                        // 'offers.availabilityStarts': 1,
-                        'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.offeredThrough': 1, 
-                        // 'offers.validFrom': 1,
-                        // 'offers.validThrough': 1,
-                        'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
+                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.identifier': 1, 'offers.offeredThrough': 1, 'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
                         ? Object.assign({}, (Array.isArray(sellerMakesOfferAvailableAtIn))
                             ? {
                                 'offers.seller.makesOffer': {

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

@@ -1,32 +1,9 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-interface IProductOffer {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: factory.offerType.Offer;
-    /**
-     * プロダクトオファーコード
-     */
-    identifier: string;
-    itemOffered: {
-        typeOf: factory.offerType.AggregateOffer;
-        /**
-         * プロダクトオファーコレクションコード
-         */
-        identifier: string;
-    };
-    availability: factory.itemAvailability.InStock | factory.itemAvailability.OutOfStock;
-    validFrom: Date;
-    validThrough: Date;
-    acceptedPaymentMethod?: {
-        typeOf: 'PaymentMethod';
-        identifier: string;
-    };
-    validForMemberTier?: Pick<factory.issuer.IMemberProgramTier, 'identifier' | 'typeOf'>;
-}
-type IDocType = IProductOffer;
+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>;

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

@@ -2,45 +2,10 @@ import type { BulkWriteResult } from 'mongodb';
 import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { IDocType } from './mongoose/schemas/productOffer';
-export { IDocType as IProductOffer };
-interface ISearchConditions {
-    limit?: number;
-    page?: number;
-    sort?: {
-        validFrom?: factory.sortType;
-    };
-    project?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    id?: {
-        $eq?: string;
-    };
-    itemOffered?: {
-        identifier?: {
-            $eq?: string;
-        };
-    };
-    validForMemberTier?: {
-        identifier?: {
-            $eq?: string;
-        };
-    };
-    validFrom?: {
-        $lte?: Date;
-    };
-    validThrough?: {
-        $gte?: Date;
-    };
-}
-export type ISavingOffer = Pick<IDocType, 'identifier' | 'itemOffered' | 'project' | 'typeOf' | 'validFrom' | 'validThrough' | 'availability' | 'validForMemberTier' | 'acceptedPaymentMethod'> & {
-    id?: never;
-};
 type IUnset = {
     [key in keyof IDocType]?: 1;
 };
-type IDocWithId = IDocType & {
+type IDocWithId = factory.productOffer.IProductOffer & {
     id: string;
 };
 type IKeyOfProjection = keyof IDocType;
@@ -50,8 +15,8 @@ type IKeyOfProjection = keyof IDocType;
 export declare class ProductOfferRepo {
     private readonly productOfferModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
-    findProductOffers(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
+    static CREATE_MONGO_CONDITIONS(params: factory.productOffer.ISearchConditions): FilterQuery<IDocType>[];
+    findProductOffers(params: factory.productOffer.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
     /**
      * オファーコードとオファーコレクションコードをキーにして冪等置換
      */
@@ -73,3 +38,4 @@ export declare class ProductOfferRepo {
         }[];
     } | void>;
 }
+export {};

package/lib/chevre/repo/productOffer.js

@@ -32,7 +32,7 @@ class ProductOfferRepo {
         this.productOfferModel = connection.model(productOffer_1.modelName, (0, productOffer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -42,19 +42,27 @@ class ProductOfferRepo {
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const itemOfferedIdentifierEq = (_e = (_d = params.itemOffered) === null || _d === void 0 ? void 0 : _d.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        const identifierEq = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierIn = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        const itemOfferedIdentifierEq = (_g = (_f = params.itemOffered) === null || _f === void 0 ? void 0 : _f.identifier) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof itemOfferedIdentifierEq === 'string') {
             andConditions.push({ 'itemOffered.identifier': { $eq: itemOfferedIdentifierEq } });
         }
-        const validForMemberTierIdentifierEq = (_g = (_f = params.validForMemberTier) === null || _f === void 0 ? void 0 : _f.identifier) === null || _g === void 0 ? void 0 : _g.$eq;
+        const validForMemberTierIdentifierEq = (_j = (_h = params.validForMemberTier) === null || _h === void 0 ? void 0 : _h.identifier) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof validForMemberTierIdentifierEq === 'string') {
             andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
         }
-        const validFromLte = (_h = params.validFrom) === null || _h === void 0 ? void 0 : _h.$lte;
+        const validFromLte = (_k = params.validFrom) === null || _k === void 0 ? void 0 : _k.$lte;
         if (validFromLte instanceof Date) {
             andConditions.push({ validFrom: { $lte: validFromLte } });
         }
-        const validThroughGte = (_j = params.validThrough) === null || _j === void 0 ? void 0 : _j.$gte;
+        const validThroughGte = (_l = params.validThrough) === null || _l === void 0 ? void 0 : _l.$gte;
         if (validThroughGte instanceof Date) {
             andConditions.push({ validThrough: { $gte: validThroughGte } });
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.20",
+    "@chevre/factory": "4.399.0-alpha.21",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.14.0-alpha.23"
+  "version": "22.14.0-alpha.24"
 }