@chevre/domain 22.3.0-alpha.1 → 22.3.0-alpha.10

package/example/src/chevre/aggregateScreeningEventMaxVersion.ts

@@ -0,0 +1,36 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+    const result = await eventSeriesRepo.aggregateMaxVersion(
+        {
+            project: {
+                id: { $eq: project.id }
+            },
+            workPerformed: {
+                identifier: {
+                    $eq: '00001'
+                }
+            },
+            location: {
+                branchCode: {
+                    $in: ['118']
+                }
+            }
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/aggregation/createAggregateEventTasks.ts

@@ -15,7 +15,7 @@ async function main() {
     const events = <Pick<
         chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
         'id' | 'typeOf' | 'startDate' | 'project'
-    >[]>await eventRepo.projectFields<chevre.factory.eventType.ScreeningEvent>(
+    >[]>await eventRepo.projectEventFields<chevre.factory.eventType.ScreeningEvent>(
         {
             typeOf: chevre.factory.eventType.ScreeningEvent,
             project: { id: { $eq: PROJECT.id } },

package/example/src/chevre/importEventsFromCOA.ts

@@ -14,6 +14,7 @@ async function main() {
     const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
     const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
     const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
     const screeningRoomRepo = await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection);
     const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
@@ -50,6 +51,7 @@ async function main() {
         categoryCode: categoryCodeRepo,
         creativeWork: creativeWorkRepo,
         event: eventRepo,
+        eventSeries: eventSeriesRepo,
         movieTheater: movieTheaterRepo,
         screeningRoom: screeningRoomRepo,
         seller: sellerRepo,

package/example/src/chevre/migrateAccountTitleAdditionalProperties.ts

@@ -0,0 +1,126 @@
+// 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 accountTitleRepo = await chevre.repository.AccountTitle.createInstance(mongoose.connection);
+
+    const cursor = accountTitleRepo.getCursor(
+        {
+            // '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 accountTitleCategory: chevre.factory.accountTitle.IAccountTitle = doc.toObject();
+        const accountTitleSets: Pick<chevre.factory.accountTitle.IAccountTitle, 'additionalProperty' | 'codeValue' | 'typeOf' | 'hasCategoryCode'>[] =
+            (Array.isArray(accountTitleCategory.hasCategoryCode))
+                ? accountTitleCategory.hasCategoryCode
+                : [];
+        for (const accountTitleSet of accountTitleSets) {
+            const accountTitles: Pick<chevre.factory.accountTitle.IAccountTitle, 'additionalProperty' | 'codeValue' | 'typeOf'>[] =
+                (Array.isArray(accountTitleSet.hasCategoryCode))
+                    ? accountTitleSet.hasCategoryCode
+                    : [];
+            for (const accountTitle of accountTitles) {
+                const additionalPropertyNamesOnResource = (Array.isArray(accountTitle.additionalProperty))
+                    ? accountTitle.additionalProperty?.map((p) => p.name)
+                    : [];
+                if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
+                    console.log(
+                        additionalPropertyNamesOnResource.join(','),
+                        additionalPropertyNamesOnResource.length,
+                        'additionalPropertyNamesOnResource found',
+                        accountTitleCategory.project.id,
+                        accountTitle.codeValue
+                    );
+                    additionalPropertyNames.push(...additionalPropertyNamesOnResource);
+                    projectIds.push(accountTitleCategory.project.id);
+                    additionalPropertyNamesOnResource.forEach((name) => {
+                        if (!name.match(/^[a-zA-Z]*$/)) {
+                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                            unexpextedprojectIds.push(accountTitleCategory.project.id);
+                        }
+                        // tslint:disable-next-line:no-magic-numbers
+                        if (name.length < 5) {
+                            // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                            unexpextedprojectIds.push(accountTitleCategory.project.id);
+                        }
+                    });
+
+                    for (const additionalPropertyNameOnResource of additionalPropertyNamesOnResource) {
+                        checked += 1;
+                        const existingAdditionalProperties = await additionalPropertyRepo.search({
+                            limit: 1,
+                            project: { id: { $eq: accountTitleCategory.project.id } },
+                            codeValue: { $eq: additionalPropertyNameOnResource },
+                            inCodeSet: { identifier: { $eq: accountTitle.typeOf } }
+                        });
+                        if (existingAdditionalProperties.length === 0) {
+                            const additionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
+                                project: accountTitleCategory.project,
+                                // id?: string;
+                                typeOf: 'CategoryCode',
+                                codeValue: additionalPropertyNameOnResource,
+                                inCodeSet: {
+                                    typeOf: 'CategoryCodeSet',
+                                    identifier: accountTitle.typeOf
+                                },
+                                name: { ja: additionalPropertyNameOnResource }
+                            };
+                            await additionalPropertyRepo.save({ attributes: additionalProperty });
+                            created += 1;
+                            console.log(
+                                'additionalProerty created',
+                                additionalPropertyNameOnResource,
+                                accountTitleCategory.project.id,
+                                accountTitle.codeValue
+                            );
+                        } else {
+                            console.log(
+                                'additionalProerty existed',
+                                additionalPropertyNameOnResource,
+                                accountTitleCategory.project.id,
+                                accountTitle.codeValue
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    });
+    console.log(i, 'docs 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/projectFields.ts

@@ -12,29 +12,19 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
 
-    const docs = await actionRepo.search(
+    const docs = await customerRepo.projectFields(
         {
             limit: 1,
-            page: 1,
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+            page: 1
         },
-        ['id', 'typeOf', 'actionStatus'],
-        ['result', 'cancelAction', 'instrument', 'object']
+        ['contactPoint', 'additionalProperty'],
+        ['contactPoint', 'additionalProperty']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });
     console.log(docs.length, 'docs found');
-
-    const actions = await actionRepo.searchByOrderNumber(
-        {
-            orderNumber: 'CIN9-4893721-9248784'
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(actions, { depth: null });
-    console.log(actions.length, 'actions found');
 }
 
 main()

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,14 +6,27 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
+    const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
+    const offerItemConditionRepo = await chevre.repository.OfferItemCondition.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await customerRepo.unsetUnnecessaryFields({
+    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },
-        $unset: {
+        $unset: <any>{
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await offerItemConditionRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
+        },
+        $unset: <any>{
             createdAt: 1,
             updatedAt: 1,
             __v: 1

package/example/src/chevre/upsertScreeningEventSeriesByVersion.ts

@@ -10,9 +10,9 @@ const PROJECT_ID = String(process.env.PROJECT_ID);
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
 
-    const result = await eventRepo.upsertScreeningEventSeriesByVersion(
+    const result = await eventSeriesRepo.upsertByVersion(
         [
             {
                 $set: {

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

@@ -41,4 +41,8 @@ export declare class AccountTitleRepo {
     }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle> & Omit<factory.accountTitle.IAccountTitle & {
         _id: import("mongoose").Types.ObjectId;
     }, never>>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/accountTitle.js

@@ -32,5 +32,11 @@ class AccountTitleRepo {
             .sort({ codeValue: factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.accountTitleModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.AccountTitleRepo = AccountTitleRepo;

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

@@ -32,4 +32,8 @@ export declare class AdditionalPropertyRepo {
             id: string;
         };
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/additionalProperty.js

@@ -202,5 +202,11 @@ class AdditionalPropertyRepo {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.additionalPropertyModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.AdditionalPropertyRepo = AdditionalPropertyRepo;

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

@@ -24,7 +24,10 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.customer.ICustomer | '_id';
+type IUnset = {
+    [key in keyof Pick<factory.customer.ICustomer, 'telephone' | 'url'>]?: 1;
+};
+type IKeyOfProjection = keyof factory.customer.ICustomer;
 /**
  * 顧客リポジトリ
  */
@@ -34,14 +37,17 @@ export declare class CustomerRepo {
     static CREATE_MONGO_CONDITIONS(params: factory.customer.ISearchConditions): FilterQuery<factory.customer.ICustomer>[];
     save(params: {
         id?: string;
-        attributes: factory.customer.ICustomer;
-    }): Promise<factory.customer.ICustomer>;
+        attributes: Omit<factory.customer.ICustomer, 'id'> & {
+            id?: never;
+            $unset?: IUnset;
+        };
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * 顧客検索
      */
-    search(conditions: factory.customer.ISearchConditions, projection?: {
-        [key in IKeyOfProjection]?: 0;
-    }): Promise<factory.customer.ICustomer[]>;
+    projectFields(conditions: factory.customer.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.customer.ICustomer[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/customer.js

@@ -24,6 +24,17 @@ exports.CustomerRepo = void 0;
 const customer_1 = require("./mongoose/schemas/customer");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'additionalProperty',
+    'contactPoint',
+    // 'email',
+    'branchCode',
+    'name',
+    'project',
+    'typeOf',
+    'url'
+    // 'telephone'f
+];
 /**
  * 顧客リポジトリ
  */
@@ -67,33 +78,49 @@ class CustomerRepo {
         return andConditions;
     }
     save(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            let customer;
+            let savedId;
             if (params.id === undefined) {
-                const doc = yield this.customerModel.create(params.attributes);
-                customer = doc.toObject();
+                const _c = params.attributes, { id, $unset } = _c, creatingDoc = __rest(_c, ["id", "$unset"]);
+                const result = yield this.customerModel.insertMany(creatingDoc, { rawResult: true });
+                const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                if (typeof insertedId !== 'string') {
+                    throw new factory.errors.Internal(`customer not saved unexpectedly. result:${JSON.stringify(result)}`);
+                }
+                savedId = insertedId;
             }
             else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.customerModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const _d = params.attributes, { id, branchCode, project, typeOf, $unset } = _d, updateFields = __rest(_d, ["id", "branchCode", "project", "typeOf", "$unset"]);
+                const doc = yield this.customerModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                    .lean()
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.customerModel.modelName);
                 }
-                customer = doc.toObject();
+                savedId = params.id;
             }
-            return customer;
+            return { id: savedId };
         });
     }
     /**
      * 顧客検索
      */
-    search(conditions, projection) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = CustomerRepo.CREATE_MONGO_CONDITIONS(conditions);
-            const query = this.customerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+                }
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.customerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 query.limit(conditions.limit)
@@ -105,13 +132,13 @@ class CustomerRepo {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-09-03~
+                .exec();
         });
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.customerModel.findOneAndRemove({ _id: params.id })
+            yield this.customerModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }