@chevre/domain 22.14.0-alpha.26 → 22.14.0-alpha.27

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,8 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.Product.createInstance(mongoose.connection);
+    await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection);
+    await chevre.repository.Seller.createInstance(mongoose.connection);
     await chevre.repository.ProductOffer.createInstance(mongoose.connection);
     console.log('success!');
 }

package/example/src/chevre/roles/addAdminProductOfferPermissionIfNotExists.ts

@@ -0,0 +1,48 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    let roleNames = [
+        chevre.factory.role.organizationRole.RoleName.InventoryManager
+    ];
+    let permissions = [
+        'admin.productOffers.*'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
+        chevre.factory.role.organizationRole.RoleName.TicketClerk
+    ];
+    permissions = [
+        'admin.productOffers.read'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/removeConsolePermissionIfExists.ts

@@ -9,8 +9,7 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'notes.*',
-        'notes.read'
+        'eventOffers.*'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

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/productOffer.js

@@ -12,6 +12,7 @@ const schemaDefinition = {
     typeOf: { type: String, required: true },
     identifier: { type: String, required: true },
     itemOffered: { 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 },
@@ -71,6 +72,10 @@ const indexes = [
         { 'itemOffered.identifier': 1, validFrom: 1 },
         { name: 'itemOfferedIdentifier' }
     ],
+    [
+        { 'offeredBy.id': 1, validFrom: 1 },
+        { name: 'offeredById' }
+    ],
     [
         { validThrough: 1, validFrom: 1 },
         { name: 'validThrough' }

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

@@ -21,7 +21,7 @@ export declare class ProductOfferRepo {
      * オファーコードとオファーコレクションコードをキーにして冪等置換
      */
     upsertOffersByIdentifier(params: {
-        $set: Pick<IDocType, 'acceptedPaymentMethod' | 'availability' | 'identifier' | 'itemOffered' | 'project' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
+        $set: Pick<IDocType, 'acceptedPaymentMethod' | 'availability' | 'identifier' | 'itemOffered' | 'offeredBy' | 'project' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
             id?: never;
         };
         $unset: IUnset;

package/lib/chevre/repo/productOffer.js

@@ -17,6 +17,7 @@ const AVAILABLE_PROJECT_FIELDS = [
     'identifier',
     'project',
     'itemOffered',
+    'offeredBy',
     'typeOf',
     'validFrom',
     'validThrough',
@@ -32,7 +33,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, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -58,15 +59,19 @@ class ProductOfferRepo {
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({ 'itemOffered.identifier': { $in: itemOfferedIdentifierIn } });
         }
-        const validForMemberTierIdentifierEq = (_l = (_k = params.validForMemberTier) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$eq;
+        const offeredByIdEq = (_l = (_k = params.offeredBy) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof offeredByIdEq === 'string') {
+            andConditions.push({ 'offeredBy.id': { $eq: offeredByIdEq } });
+        }
+        const validForMemberTierIdentifierEq = (_o = (_m = params.validForMemberTier) === null || _m === void 0 ? void 0 : _m.identifier) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof validForMemberTierIdentifierEq === 'string') {
             andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
         }
-        const validFromLte = (_m = params.validFrom) === null || _m === void 0 ? void 0 : _m.$lte;
+        const validFromLte = (_p = params.validFrom) === null || _p === void 0 ? void 0 : _p.$lte;
         if (validFromLte instanceof Date) {
             andConditions.push({ validFrom: { $lte: validFromLte } });
         }
-        const validThroughGte = (_o = params.validThrough) === null || _o === void 0 ? void 0 : _o.$gte;
+        const validThroughGte = (_q = params.validThrough) === null || _q === void 0 ? void 0 : _q.$gte;
         if (validThroughGte instanceof Date) {
             andConditions.push({ validThrough: { $gte: validThroughGte } });
         }
@@ -108,7 +113,7 @@ class ProductOfferRepo {
             const queryFilters = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set, $unset }) => {
-                    const { availability, identifier, itemOffered, project, validFrom, validThrough, acceptedPaymentMethod, validForMemberTier } = $set;
+                    const { availability, identifier, itemOffered, offeredBy, project, validFrom, validThrough, acceptedPaymentMethod, validForMemberTier } = $set;
                     if (typeof identifier !== 'string' || identifier === '') {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
@@ -139,7 +144,7 @@ class ProductOfferRepo {
                         bulkWriteOps.push({ updateOne });
                     }
                     else {
-                        const setOnInsert = Object.assign(Object.assign({ itemOffered, identifier, project, typeOf: factory.offerType.Offer, availability,
+                        const setOnInsert = Object.assign(Object.assign({ itemOffered, offeredBy, identifier, project, typeOf: factory.offerType.Offer, availability,
                             validFrom,
                             validThrough }, (typeof (acceptedPaymentMethod === null || acceptedPaymentMethod === void 0 ? void 0 : acceptedPaymentMethod.typeOf) === 'string') ? { acceptedPaymentMethod } : undefined), (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.typeOf) === 'string') ? { validForMemberTier } : undefined);
                         const updateFilter = {

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.399.0-alpha.22",
-    "@cinerino/sdk": "12.2.0",
+    "@chevre/factory": "4.399.0-alpha.23",
+    "@cinerino/sdk": "12.3.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -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.26"
+  "version": "22.14.0-alpha.27"
 }

package/example/src/chevre/roles/addPermissionIfNotExists.ts

@@ -1,48 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
-
-    const roleNames = [
-        chevre.factory.role.organizationRole.RoleName.AdminInventoryManager
-    ];
-    const permissions = [
-        'admin.sellers.events.*'
-    ];
-    for (const roleName of roleNames) {
-        for (const permission of permissions) {
-            const result = await roleRepo.addPermissionIfNotExists({
-                roleName: { $eq: roleName },
-                permission
-            });
-            console.log('permission added.', result, roleName);
-        }
-    }
-
-    // roleNames = [
-    //     chevre.factory.role.organizationRole.RoleName.InventoryManager,
-    //     chevre.factory.role.organizationRole.RoleName.SellersOwner,
-    //     chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
-    // ];
-    // permissions = [
-    //     'admin.sellers.eventSeries.*'
-    // ];
-    // for (const roleName of roleNames) {
-    //     for (const permission of permissions) {
-    //         const result = await roleRepo.addPermissionIfNotExists({
-    //             roleName: { $eq: roleName },
-    //             permission
-    //         });
-    //         console.log('permission added.', result, roleName);
-    //     }
-    // }
-}
-
-main()
-    .then()
-    .catch(console.error);