@chevre/domain 22.2.0 → 22.3.0-alpha.1

package/example/src/chevre/migrateCustomerAdditionalProperties.ts

@@ -0,0 +1,114 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
+    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
+
+    const cursor = customerRepo.getCursor(
+        {
+            // typeOf: { $eq: chevre.factory.placeType.ScreeningRoom }
+            // 'project.id': { $eq: project.id },
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+        },
+        {
+            // paymentMethods: 1,
+            // project: 1,
+            // orderDate: 1
+        }
+    );
+    console.log('docs found');
+
+    const additionalPropertyNames: string[] = [];
+    const projectIds: string[] = [];
+    const unexpextedprojectIds: string[] = [];
+    let checked: number = 0;
+    let created: number = 0;
+
+    let i = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const customer: chevre.factory.customer.ICustomer = doc.toObject();
+
+        const additionalPropertyNamesOnResource = (Array.isArray(customer.additionalProperty))
+            ? customer.additionalProperty?.map((p) => p.name)
+            : [];
+        if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
+            console.log(
+                additionalPropertyNamesOnResource.join(','),
+                additionalPropertyNamesOnResource.length,
+                'additionalPropertyNamesOnResource found',
+                customer.project.id,
+                customer.branchCode
+            );
+            additionalPropertyNames.push(...additionalPropertyNamesOnResource);
+            projectIds.push(customer.project.id);
+            additionalPropertyNamesOnResource.forEach((name) => {
+                if (!name.match(/^[a-zA-Z]*$/)) {
+                    unexpextedprojectIds.push(customer.project.id);
+                }
+                // tslint:disable-next-line:no-magic-numbers
+                if (name.length < 5) {
+                    unexpextedprojectIds.push(customer.project.id);
+                }
+            });
+
+            for (const additionalPropertyNameOnResource of additionalPropertyNamesOnResource) {
+                checked += 1;
+                const existingAdditionalProperties = await additionalPropertyRepo.search({
+                    limit: 1,
+                    project: { id: { $eq: customer.project.id } },
+                    codeValue: { $eq: additionalPropertyNameOnResource },
+                    inCodeSet: { identifier: { $eq: customer.typeOf } }
+                });
+                if (existingAdditionalProperties.length === 0) {
+                    const additionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
+                        project: customer.project,
+                        // id?: string;
+                        typeOf: 'CategoryCode',
+                        codeValue: additionalPropertyNameOnResource,
+                        inCodeSet: {
+                            typeOf: 'CategoryCodeSet',
+                            identifier: customer.typeOf
+                        },
+                        name: { ja: additionalPropertyNameOnResource }
+                    };
+                    await additionalPropertyRepo.save({ attributes: additionalProperty });
+                    created += 1;
+                    console.log(
+                        'additionalProerty created',
+                        additionalPropertyNameOnResource,
+                        customer.project.id,
+                        customer.branchCode
+                    );
+                } else {
+                    console.log(
+                        'additionalProerty existed',
+                        additionalPropertyNameOnResource,
+                        customer.project.id,
+                        customer.branchCode
+                    );
+                }
+            }
+        }
+    });
+    console.log(i, 'places checked');
+    console.log('additionalPropertyNames:', [...new Set(additionalPropertyNames)]);
+    console.log('projectIds:', [...new Set(projectIds)]);
+    console.log('unexpextedprojectIds:', [...new Set(unexpextedprojectIds)]);
+    console.log('checked:', checked);
+    console.log('created:', created);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,10 +6,10 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await categoryCodeRepo.unsetUnnecessaryFields({
+    updateResult = await customerRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },

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

@@ -50,5 +50,9 @@ export declare class CustomerRepo {
     }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & Omit<factory.customer.ICustomer & {
         _id: import("mongoose").Types.ObjectId;
     }, never>>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/customer.js

@@ -32,7 +32,7 @@ class CustomerRepo {
         this.customerModel = connection.model(customer_1.modelName, (0, customer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -55,29 +55,17 @@ class CustomerRepo {
                 ]
             });
         }
+        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
-    // public async findById(
-    //     conditions: {
-    //         id: string;
-    //     },
-    //     projection?: any
-    // ): Promise<factory.customer.ICustomer> {
-    //     const doc = await this.customerModel.findOne(
-    //         { _id: conditions.id },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0,
-    //             ...projection
-    //         }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.customerModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let customer;
@@ -132,5 +120,11 @@ class CustomerRepo {
             .sort({ branchCode: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.customerModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.CustomerRepo = CustomerRepo;

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

@@ -5,6 +5,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Customer";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

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

@@ -19,6 +19,9 @@ const schemaDefinition = {
     },
     url: String,
     telephone: String
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -29,10 +32,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -46,26 +47,7 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 顧客スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { branchCode: 1 },
         { name: 'searchByBranchCode' }
@@ -96,3 +78,19 @@ const indexes = [
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 顧客スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.js

@@ -186,6 +186,9 @@ function availableSalesTicket2offerWithDetails(params) {
         }
     }
     const priceSpecification = Object.assign({}, (typeof (appliesToSurfrock === null || appliesToSurfrock === void 0 ? void 0 : appliesToSurfrock.identifier) === 'string') ? { appliesToSurfrock } : undefined);
+    const disPrice = (typeof availableSalesTicket.disPrice === 'number' && availableSalesTicket.disPrice > 0)
+        ? availableSalesTicket.disPrice
+        : 0; // support case of coupon(2024-08-31~)
     const ticketInfo = {
         ticketCode: availableSalesTicket.ticketCode,
         ticketName: availableSalesTicket.ticketName,
@@ -193,7 +196,7 @@ function availableSalesTicket2offerWithDetails(params) {
         ticketNameKana: availableSalesTicket.ticketNameKana,
         stdPrice: availableSalesTicket.stdPrice,
         addPrice: availableSalesTicket.addPrice,
-        disPrice: 0,
+        disPrice,
         // salePrice: salePrice,
         salesTicketSalePrice: Number(availableSalesTicket.salePrice),
         spseatAdd1: offer.ticketInfo.spseatAdd1,

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.js

@@ -98,12 +98,44 @@ function createPriceComponent(params) {
             eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         }
     }
-    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : ticketInfo.stdPrice;
-    const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price: Number(ticketInfo.stdPrice), priceCurrency: factory.priceCurrency.JPY, referenceQuantity: {
-            typeOf: 'QuantitativeValue',
-            unitCode: factory.unitCode.C62,
-            value: 1
-        }, valueAddedTaxIncluded: true, accounting: {
+    const { disPrice, limitCount, stdPrice } = ticketInfo;
+    if (typeof stdPrice !== 'number') {
+        throw new factory.errors.Argument('ticketInfo.stdPrice', 'must be number');
+    }
+    const accountsReceivable = (ticketInfo.mvtkAppPrice > 0) ? ticketInfo.mvtkAppPrice : stdPrice;
+    // const maxPrice: number = stdPrice;
+    let price = stdPrice;
+    // support disPrice(2024-09-02~)
+    if (typeof disPrice === 'number' && disPrice > 0) {
+        price -= disPrice;
+    }
+    let referenceQuantity = {
+        typeOf: 'QuantitativeValue',
+        unitCode: factory.unitCode.C62,
+        value: 1
+    };
+    switch (ticketInfo.limitUnit) {
+        case '001':
+            referenceQuantity = {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: Number(limitCount)
+            };
+            price = Number(limitCount) * price;
+            break;
+        case '002':
+            referenceQuantity = {
+                typeOf: 'QuantitativeValue',
+                unitCode: factory.unitCode.C62,
+                value: 1,
+                minValue: Number(limitCount)
+            };
+            break;
+        default:
+        // no op
+        // referenceQuantity.value = 1;
+    }
+    const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price, priceCurrency: factory.priceCurrency.JPY, referenceQuantity, valueAddedTaxIncluded: true, accounting: {
             typeOf: 'Accounting',
             accountsReceivable
         } }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
@@ -114,17 +146,6 @@ function createPriceComponent(params) {
             ]
         }
         : undefined);
-    switch (ticketInfo.limitUnit) {
-        case '001':
-            unitPriceSpec.referenceQuantity.value = Number(ticketInfo.limitCount);
-            unitPriceSpec.price = Number(ticketInfo.limitCount) * Number(ticketInfo.stdPrice);
-            break;
-        case '002':
-            unitPriceSpec.referenceQuantity.minValue = Number(ticketInfo.limitCount);
-            break;
-        default:
-            unitPriceSpec.referenceQuantity.value = 1;
-    }
     // 区分加算料金
     const categoryCodeChargeSpecs = [];
     // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.382.0",
-    "@cinerino/sdk": "10.8.0",
+    "@chevre/factory": "4.383.0-alpha.1",
+    "@cinerino/sdk": "10.9.0-alpha.1",
     "@motionpicture/coa-service": "9.5.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0"
+  "version": "22.3.0-alpha.1"
 }