@chevre/domain 20.4.0-alpha.0 → 20.4.0-alpha.2

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

@@ -34,7 +34,6 @@ export declare class MongoRepository {
     confirm<T extends factory.account.transactionType>(params: {
         typeOf?: T;
         id: string;
-        result: factory.account.transaction.IResult;
         potentialActions: factory.account.transaction.IPotentialActions;
     }): Promise<factory.account.transaction.ITransaction<T>>;
     /**

package/lib/chevre/repo/accountTransaction.js

@@ -154,7 +154,7 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOneAndUpdate(Object.assign({ _id: params.id, status: factory.transactionStatusType.InProgress }, (typeof params.typeOf === 'string') ? { typeOf: params.typeOf } : undefined), {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                result: params.result,
+                // result: params.result, // resultを更新
                 potentialActions: params.potentialActions
             }, { new: true })
                 .exec();

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

@@ -0,0 +1,31 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+/**
+ * コメントリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly commentModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.comment.ISearchConditions): any[];
+    /**
+     * 検索
+     */
+    search(params: factory.creativeWork.comment.ISearchConditions): Promise<factory.creativeWork.comment.IComment[]>;
+    findById(params: {
+        id: string;
+    }): Promise<factory.creativeWork.comment.IComment>;
+    create(params: factory.creativeWork.comment.IComment): Promise<factory.creativeWork.comment.IComment>;
+    updateById(params: {
+        id?: string;
+        attributes: {
+            text: string;
+        };
+    }): Promise<void>;
+    /**
+     * 削除する
+     */
+    deleteById(params: {
+        id: string;
+    }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+}

package/lib/chevre/repo/comment.js

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const comments_1 = require("./mongoose/model/comments");
+const factory = require("../factory");
+/**
+ * コメントリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.commentModel = connection.model(comments_1.modelName);
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        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') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const aboutIdEq = (_d = (_c = params.about) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof aboutIdEq === 'string') {
+            andConditions.push({ 'about.id': { $exists: true, $eq: aboutIdEq } });
+        }
+        const aboutIdIn = (_f = (_e = params.about) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        if (Array.isArray(aboutIdIn)) {
+            andConditions.push({ 'about.id': { $exists: true, $in: aboutIdIn } });
+        }
+        return andConditions;
+    }
+    /**
+     * 検索
+     */
+    search(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const query = this.commentModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
+            });
+            if (typeof params.limit === 'number') {
+                const page = (typeof params.page === 'number') ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: 10000 })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.commentModel.findOne({ _id: params.id }, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.commentModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const creatingDoc = Object.assign({ about: params.about, author: params.author, dateCreated: new Date(), project: params.project, text: params.text, typeOf: factory.creativeWorkType.Comment }, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined);
+            const doc = yield this.commentModel.create(creatingDoc);
+            return doc.toObject();
+        });
+    }
+    updateById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updateFields = {
+                $set: Object.assign({ dateModified: new Date() }, (typeof params.attributes.text === 'string') ? { text: params.attributes.text } : undefined)
+            };
+            const doc = yield this.commentModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.commentModel.modelName);
+            }
+        });
+    }
+    /**
+     * 削除する
+     */
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.commentModel.findOneAndRemove({ _id: params.id })
+                .exec();
+        });
+    }
+    getCursor(conditions, projection) {
+        return this.commentModel.find(conditions, projection)
+            .sort({ codeValue: factory.sortType.Ascending })
+            .cursor();
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/event.js

@@ -466,14 +466,18 @@ class MongoRepository {
             if (Array.isArray(params)) {
                 params.forEach((creatingEventParams) => {
                     var _a, _b;
+                    if (creatingEventParams.attributes.typeOf !== factory.eventType.ScreeningEvent) {
+                        throw new factory.errors.NotImplemented(`${factory.eventType.ScreeningEventSeries} not implemented`);
+                    }
                     const additionalPropertyValue = (_b = (_a = creatingEventParams.attributes.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === creatingEventParams.filter.name)) === null || _b === void 0 ? void 0 : _b.value;
                     if (typeof additionalPropertyValue !== 'string') {
                         throw new factory.errors.NotFound('additionalProperty.value');
                     }
+                    const _c = creatingEventParams.attributes, { identifier, project, superEvent, workPerformed, typeOf, location, name, remainingAttendeeCapacity, maximumAttendeeCapacity } = _c, updateFields = __rest(_c, ["identifier", "project", "superEvent", "workPerformed", "typeOf", "location", "name", "remainingAttendeeCapacity", "maximumAttendeeCapacity"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                typeOf: creatingEventParams.attributes.typeOf,
+                                typeOf,
                                 // 追加特性をキーに更新
                                 additionalProperty: {
                                     $exists: true,
@@ -481,7 +485,18 @@ class MongoRepository {
                                 }
                             },
                             update: {
-                                $setOnInsert: Object.assign({ _id: uniqid() }, creatingEventParams.attributes)
+                                $setOnInsert: {
+                                    _id: uniqid(),
+                                    typeOf,
+                                    project,
+                                    superEvent,
+                                    workPerformed,
+                                    location,
+                                    name
+                                    // ...creatingEventParams.attributes
+                                },
+                                // 変更可能な属性のみ上書き
+                                $set: updateFields
                             },
                             upsert: true
                         }

package/lib/chevre/repo/mongoose/model/{accountAction.d.ts → comments.d.ts}

@@ -1,7 +1,7 @@
 import * as mongoose from 'mongoose';
-declare const modelName = "AccountAction";
+declare const modelName = "CreativeWork";
 /**
- * アクションスキーマ
+ * コメントスキーマ
  */
 declare const schema: mongoose.Schema<mongoose.Document<any, any, any>, mongoose.Model<mongoose.Document<any, any, any>, any, any>, undefined, {}>;
 export { modelName, schema };

package/lib/chevre/repo/mongoose/model/comments.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose = require("mongoose");
+const modelName = 'CreativeWork';
+exports.modelName = modelName;
+const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
+/**
+ * コメントスキーマ
+ */
+const schema = new mongoose.Schema({
+    project: mongoose.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    about: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
+    author: mongoose.SchemaTypes.Mixed,
+    // commnet: Comment[]
+    commentCount: { type: Number, default: 0 },
+    dateCreated: Date,
+    dateModified: Date,
+    text: {
+        type: String,
+        required: true
+    }
+}, {
+    collection: 'comments',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern,
+    strict: true,
+    useNestedStrict: true,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
+schema.index({ dateCreated: 1 }, {
+    name: 'searchByDateCreated'
+});
+schema.index({ 'project.id': 1, dateCreated: 1 }, {
+    name: 'searchByProjectId'
+});
+schema.index({ 'about.id': 1, dateCreated: 1 }, {
+    name: 'searchByAboutId',
+    partialFilterExpression: {
+        'about.id': { $exists: true }
+    }
+});
+schema.index({ additionalProperty: 1, dateCreated: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
+mongoose.model(modelName, schema)
+    .on('index', 
+// tslint:disable-next-line:no-single-line-block-comment
+/* istanbul ignore next */
+(error) => {
+    if (error !== undefined) {
+        // tslint:disable-next-line:no-console
+        console.error(error);
+    }
+});

package/lib/chevre/repo/mongoose/model/order.js

@@ -32,8 +32,8 @@ const schema = new mongoose.Schema({
     orderDate: Date,
     isGift: Boolean,
     dateReturned: Date,
-    // ↓追加(2022-04-15~)
-    orderedItem: [mongoose.SchemaTypes.Mixed]
+    orderedItem: [mongoose.SchemaTypes.Mixed],
+    additionalProperty: [mongoose.SchemaTypes.Mixed] // 追加(2023-02-13~)
 }, {
     collection: 'orders',
     id: true,
@@ -297,6 +297,12 @@ schema.index({ price: 1, orderDate: -1 }, {
         price: { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, orderDate: -1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

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

@@ -33,9 +33,15 @@ export declare class MongoRepository {
      * 変更可能な属性を更新する
      */
     updateChangeableAttributes(params: {
+        additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
         name?: string;
         orderNumber: string;
     }): Promise<void>;
+    findById(params: {
+        id: string;
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.order.IOrder>;
     /**
      * 注文番号から注文を取得する
      */

package/lib/chevre/repo/order.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -39,6 +39,22 @@ class MongoRepository {
                 }
             }
         }
+        const additionalPropertyAll = (_a = params.additionalProperty) === null || _a === void 0 ? void 0 : _a.$all;
+        if (Array.isArray(additionalPropertyAll)) {
+            andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
+        }
+        const additionalPropertyIn = (_b = params.additionalProperty) === null || _b === void 0 ? void 0 : _b.$in;
+        if (Array.isArray(additionalPropertyIn)) {
+            andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
+        }
+        const additionalPropertyNin = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$nin;
+        if (Array.isArray(additionalPropertyNin)) {
+            andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
+        }
+        const additionalPropertyElemMatch = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.identifier !== undefined) {
@@ -87,7 +103,7 @@ class MongoRepository {
                 });
             }
         }
-        const brokerIdEq = (_b = (_a = params.broker) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const brokerIdEq = (_f = (_e = params.broker) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
                 'broker.id': {
@@ -304,7 +320,7 @@ class MongoRepository {
                 }
             }
         }
-        const nameEq = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$eq;
+        const nameEq = (_g = params.name) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof nameEq === 'string') {
             andConditions.push({
                 name: {
@@ -313,7 +329,7 @@ class MongoRepository {
                 }
             });
         }
-        const nameRegex = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 name: {
@@ -346,7 +362,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIdentifierIn = (_g = (_f = (_e = params.acceptedOffers) === null || _e === void 0 ? void 0 : _e.itemOffered) === null || _f === void 0 ? void 0 : _f.identifier) === null || _g === void 0 ? void 0 : _g.$in;
+        const itemOfferedIdentifierIn = (_l = (_k = (_j = params.acceptedOffers) === null || _j === void 0 ? void 0 : _j.itemOffered) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -355,7 +371,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_k = (_j = (_h = params.acceptedOffers) === null || _h === void 0 ? void 0 : _h.itemOffered) === null || _j === void 0 ? void 0 : _j.typeOf) === null || _k === void 0 ? void 0 : _k.$in;
+        const itemOfferedTypeOfIn = (_p = (_o = (_m = params.acceptedOffers) === null || _m === void 0 ? void 0 : _m.itemOffered) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -364,7 +380,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_p = (_o = (_m = (_l = params.acceptedOffers) === null || _l === void 0 ? void 0 : _l.itemOffered) === null || _m === void 0 ? void 0 : _m.issuedThrough) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_t = (_s = (_r = (_q = params.acceptedOffers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.typeOf) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -373,7 +389,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_t = (_s = (_r = (_q = params.acceptedOffers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.id) === null || _t === void 0 ? void 0 : _t.$in;
+        const itemOfferedIssuedThroughIdIn = (_x = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.issuedThrough) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -382,7 +398,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_x = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.programMembershipUsed) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.programMembershipUsed) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -391,7 +407,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_3 = (_2 = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.programMembershipUsed) === null || _0 === void 0 ? void 0 : _0.issuedThrough) === null || _1 === void 0 ? void 0 : _1.serviceType) === null || _2 === void 0 ? void 0 : _2.codeValue) === null || _3 === void 0 ? void 0 : _3.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_7 = (_6 = (_5 = (_4 = (_3 = (_2 = params.acceptedOffers) === null || _2 === void 0 ? void 0 : _2.itemOffered) === null || _3 === void 0 ? void 0 : _3.programMembershipUsed) === null || _4 === void 0 ? void 0 : _4.issuedThrough) === null || _5 === void 0 ? void 0 : _5.serviceType) === null || _6 === void 0 ? void 0 : _6.codeValue) === null || _7 === void 0 ? void 0 : _7.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -587,7 +603,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_5 = (_4 = params.paymentMethods) === null || _4 === void 0 ? void 0 : _4.additionalProperty) === null || _5 === void 0 ? void 0 : _5.$all;
+        const paymentMethodAdditionalPropertyAll = (_9 = (_8 = params.paymentMethods) === null || _8 === void 0 ? void 0 : _8.additionalProperty) === null || _9 === void 0 ? void 0 : _9.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -596,7 +612,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_7 = (_6 = params.paymentMethods) === null || _6 === void 0 ? void 0 : _6.additionalProperty) === null || _7 === void 0 ? void 0 : _7.$in;
+        const paymentMethodAdditionalPropertyIn = (_11 = (_10 = params.paymentMethods) === null || _10 === void 0 ? void 0 : _10.additionalProperty) === null || _11 === void 0 ? void 0 : _11.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -761,17 +777,45 @@ class MongoRepository {
      */
     updateChangeableAttributes(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, Object.assign({}, (typeof params.name === 'string') ? { name: params.name } : undefined), {
+            const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, {
+                $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
+            }, {
                 projection: {
+                    _id: 1
+                }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+        });
+    }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
                     __v: 0,
                     createdAt: 0,
                     updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
                 }
-            })
+            }
+            const doc = yield this.orderModel.findById({ _id: params.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
+            return doc.toObject();
         });
     }
     /**

package/lib/chevre/repository.d.ts

@@ -48,9 +48,6 @@ import { CognitoRepository as PersonRepo } from './repo/person';
  */
 export declare class Account extends AccountRepo {
 }
-/**
- * 口座アクションリポジトリ
- */
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/repository.js

@@ -53,10 +53,6 @@ const person_1 = require("./repo/person");
 class Account extends account_1.MongoRepository {
 }
 exports.Account = Account;
-/**
- * 口座アクションリポジトリ
- */
-// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/service/account.js

@@ -53,12 +53,6 @@ exports.close = close;
  */
 function transferMoney(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // let action = await repos.accountAction.startByIdentifier<factory.actionType.MoneyTransfer>(actionAttributes);
-        // すでに完了していれば何もしない
-        // if (action.actionStatus === factory.actionStatusType.CompletedActionStatus) {
-        //     return;
-        // }
         const action = actionAttributes;
         let fromAccountNumber;
         let toAccountNumber;
@@ -81,18 +75,8 @@ function transferMoney(actionAttributes) {
             });
         }
         catch (error) {
-            // actionにエラー結果を追加
-            // try {
-            //     const actionError = { ...error, message: error.message, name: error.name };
-            //     await repos.accountAction.giveUp(action.typeOf, action.id, actionError);
-            // } catch (__) {
-            //     // 失敗したら仕方ない
-            // }
             throw error;
         }
-        // アクション完了
-        // const actionResult: factory.account.action.moneyTransfer.IResult = {};
-        // action = await repos.accountAction.complete(action.typeOf, action.id, actionResult);
     });
 }
 exports.transferMoney = transferMoney;
@@ -133,17 +117,6 @@ function cancelMoneyTransfer(params) {
                 : transaction.object.amount.value,
             transactionId: transaction.id
         });
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // アクション取得
-        // const actions = await repos.accountAction.searchTransferActions({
-        //     purpose: {
-        //         typeOf: { $eq: transaction.typeOf },
-        //         id: { $eq: transaction.id }
-        //     }
-        // });
-        // await Promise.all(actions.map(async (action) => {
-        //     await repos.accountAction.cancel(action.typeOf, action.id);
-        // }));
     });
 }
 exports.cancelMoneyTransfer = cancelMoneyTransfer;

package/lib/chevre/service/accountTransaction/deposit.js

@@ -63,10 +63,6 @@ function start(params) {
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
-        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
-        // アクション開始
-        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
-        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });