@chevre/domain 28.0.0-alpha.29 → 28.0.0-alpha.30

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

@@ -36,17 +36,13 @@ export declare class IssuerRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.issuer.IIssuer, "id"> & {
-        hasMemberProgram?: (factory.issuer.IMemberProgram & {
-            hasTiers?: Pick<factory.issuer.IMemberProgramTier, "identifier" | "typeOf">[];
-        })[];
+        hasMemberProgram?: factory.issuer.IMemberProgram[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.issuer.IIssuer, "id"> & {
-        hasMemberProgram?: (factory.issuer.IMemberProgram & {
-            hasTiers?: Pick<factory.issuer.IMemberProgramTier, "identifier" | "typeOf">[];
-        })[];
+        hasMemberProgram?: factory.issuer.IMemberProgram[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

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

@@ -1,22 +1,11 @@
 import { Connection } from 'mongoose';
 import { factory } from '../factory';
-type IMemberProgramTier = Pick<factory.issuer.IMemberProgramTier, 'identifier' | 'typeOf'>;
-type IMemberProgram = factory.issuer.IMemberProgram & {
-    hasTiers?: IMemberProgramTier[];
-};
+type IMemberProgram = factory.issuer.IMemberProgram;
 type IMemberProgramAsSearchResult = IMemberProgram & {
     hostingOrganization: {
         identifier: string;
     };
 };
-type IMemberProgramTierAsSearchResult = IMemberProgramTier & {
-    isTierOf: {
-        identifier: string;
-        hostingOrganization: {
-            identifier: string;
-        };
-    };
-};
 /**
  * メンバープログラムリポジトリ
  */
@@ -44,31 +33,6 @@ export declare class MemberProgramRepo {
             $in?: string[];
         };
     }): Promise<IMemberProgramAsSearchResult[]>;
-    /**
-     * tierを検索する
-     */
-    projectMemberProgramTiers(params: {
-        limit?: number;
-        page?: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        isTierOf?: {
-            hostingOrganization?: {
-                id?: {
-                    $eq?: string;
-                };
-            };
-            identifier?: {
-                $eq?: string;
-            };
-        };
-        identifier?: {
-            $eq?: string;
-        };
-    }): Promise<IMemberProgramTierAsSearchResult[]>;
     create(params: {
         project: {
             id: string;
@@ -83,7 +47,6 @@ export declare class MemberProgramRepo {
             id: string;
         };
         identifier: string;
-        hasTiers?: Pick<factory.issuer.IMemberProgramTier, 'identifier'>[];
         hostingOrganization: {
             id: string;
         };

package/lib/chevre/repo/memberProgram.js

@@ -47,7 +47,6 @@ class MemberProgramRepo {
                     _id: 0,
                     typeOf: '$hasMemberProgram.typeOf',
                     identifier: '$hasMemberProgram.identifier',
-                    hasTiers: '$hasMemberProgram.hasTiers',
                     hostingOrganization: {
                         identifier: '$identifier'
                     }
@@ -62,62 +61,6 @@ class MemberProgramRepo {
         return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
     }
-    /**
-     * tierを検索する
-     */
-    async projectMemberProgramTiers(params) {
-        const matchStages = [];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-        }
-        const hostingOrganizationIdEq = params.isTierOf?.hostingOrganization?.id?.$eq;
-        if (typeof hostingOrganizationIdEq === 'string') {
-            matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(hostingOrganizationIdEq) } } });
-        }
-        const memberProgramIdentifierEq = params.isTierOf?.identifier?.$eq;
-        if (typeof memberProgramIdentifierEq === 'string') {
-            matchStages.push({ $match: { 'hasMemberProgram.identifier': { $exists: true, $eq: memberProgramIdentifierEq } } });
-        }
-        const identifierEq = params.identifier?.$eq;
-        if (typeof identifierEq === 'string') {
-            matchStages.push({ $match: { 'hasMemberProgram.hasTiers.identifier': { $exists: true, $eq: identifierEq } } });
-        }
-        const aggregate = this.issuerModel.aggregate([
-            {
-                $unwind: {
-                    path: '$hasMemberProgram'
-                }
-            },
-            {
-                $unwind: {
-                    path: '$hasMemberProgram.hasTiers'
-                }
-            },
-            ...matchStages,
-            { $sort: { 'hasMemberProgram.hasTiers.identifier': factory_1.factory.sortType.Ascending } },
-            {
-                $project: {
-                    _id: 0,
-                    typeOf: '$hasMemberProgram.hasTiers.typeOf',
-                    identifier: '$hasMemberProgram.hasTiers.identifier',
-                    isTierOf: {
-                        identifier: '$hasMemberProgram.identifier',
-                        hostingOrganization: {
-                            identifier: '$identifier'
-                        }
-                    }
-                }
-            }
-        ]);
-        if (typeof params.limit === 'number' && params.limit > 0) {
-            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.skip(params.limit * (page - 1))
-                .limit(params.limit);
-        }
-        return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-    }
     async create(params) {
         let doc = await this.issuerModel.findOne({
             _id: { $eq: params.hostingOrganization.id },
@@ -146,13 +89,9 @@ class MemberProgramRepo {
         }
     }
     async updateOne(params) {
-        const hasTiers = (Array.isArray(params.hasTiers))
-            ? params.hasTiers.map(({ identifier }) => ({ identifier, typeOf: 'MemberProgramTier' }))
-            : [];
         const updatingMemberProgram = {
             typeOf: 'MemberProgram',
-            identifier: params.identifier,
-            hasTiers
+            identifier: params.identifier
         };
         const doc = await this.issuerModel.findOneAndUpdate({
             _id: { $eq: params.hostingOrganization.id },

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

@@ -2,9 +2,7 @@ import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from '
 import { factory } from '../../../factory';
 import { IVirtuals } from '../virtuals';
 export type IDocType = Omit<factory.issuer.IIssuer, 'id'> & {
-    hasMemberProgram?: (factory.issuer.IMemberProgram & {
-        hasTiers?: Pick<factory.issuer.IMemberProgramTier, 'identifier' | 'typeOf'>[];
-    })[];
+    hasMemberProgram?: factory.issuer.IMemberProgram[];
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -61,16 +61,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'project.id': 1, 'hasMemberProgram.hasTiers.identifier': 1 },
-        {
-            name: 'uniqueMemberProgramTierIdentifier',
-            unique: true,
-            partialFilterExpression: {
-                'hasMemberProgram.hasTiers.identifier': { $exists: true }
-            }
-        }
-    ],
     [
         { 'hasMemberProgram.identifier': 1, identifier: 1 },
         { name: 'hasMemberProgramIdentifier' }

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

@@ -25,7 +25,7 @@ declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: Pick<IMinimizedIndividualEvent, 'id'> & {
         offers?: {
-            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
+            validForMemberTier?: never;
             identifier?: string;
         };
     };

package/lib/chevre/service/offer/event/issueEventOfferTicket.js

@@ -73,8 +73,6 @@ function issueEventOfferTicket(params) {
             typeOf: seller.typeOf,
             ...(typeof seller.name.ja === 'string') ? { name: seller.name.ja } : undefined
         };
-        // const validForMemberTierToken = ticketedOffer?.validForMemberTier?.token;
-        // const validForMemberProgramIdentifier = ticketedOffer?.validForMemberTier?.isTierOf.identifier;
         const authorizationObject = {
             typeOf: factory_1.factory.offerType.Offer,
             itemOffered: {
@@ -88,15 +86,6 @@ function issueEventOfferTicket(params) {
             ...(typeof ticketedOffer?.token === 'string' && ticketedOffer.token !== '')
                 ? { token: ticketedOffer.token }
                 : undefined,
-            // ...(typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
-            //     && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
-            //     ? {
-            //         validForMemberTier: {
-            //             token: validForMemberTierToken,
-            //             isTierOf: { identifier: validForMemberProgramIdentifier }
-            //         }
-            //     }
-            //     : undefined
         };
         // validations(eventId,eventOfferIdentifier,offerToken...)
         await (0, validateStartRequest_1.validEventOfferByApplicationExists)({

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.1.0-alpha.5",
+    "@chevre/factory": "11.1.0-alpha.6",
     "@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.29"
+  "version": "28.0.0-alpha.30"
 }