@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/service/task/onResourceDeleted.js

@@ -1,13 +1,4 @@
 "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.call = call;
 const factory = require("../../factory");
@@ -45,8 +36,8 @@ const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
  * タスク実行関数
  */
 function call(params) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        yield onResourceDeleted(params.data)({
+    return async ({ connection }) => {
+        await onResourceDeleted(params.data)({
             acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
             action: new action_1.ActionRepo(connection),
             aggregateOffer: new aggregateOffer_1.AggregateOfferRepo(connection),
@@ -68,13 +59,12 @@ function call(params) {
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
         });
-    });
+    };
 }
 function onResourceDeleted(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useInformResourceTypes']);
-        const useInformResourceTypes = setting === null || setting === void 0 ? void 0 : setting.useInformResourceTypes;
+    return async (repos) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useInformResourceTypes']);
+        const useInformResourceTypes = setting?.useInformResourceTypes;
         const useInform = params.useInform === true
             && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
         const isDeleted = params.isDeleted === true;
@@ -83,7 +73,7 @@ function onResourceDeleted(params) {
             if (useInform) {
                 switch (resourceType) {
                     case 'POS':
-                        yield (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
+                        await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
                             project: { id: params.project.id },
                             ids: [params.operator.id],
                             typeOf: factory.placeType.MovieTheater
@@ -97,42 +87,42 @@ function onResourceDeleted(params) {
                 case 'POS':
                     break;
                 case factory.eventType.ScreeningEventSeries:
-                    yield (0, deleteResourcesByEventSeries_1.deleteResourcesByEventSeries)({
+                    await (0, deleteResourcesByEventSeries_1.deleteResourcesByEventSeries)({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
                     break;
                 case factory.placeType.ScreeningRoom:
-                    yield (0, deleteResourcesByRoom_1.deleteResourcesByRoom)({
+                    await (0, deleteResourcesByRoom_1.deleteResourcesByRoom)({
                         project: { id: params.project.id },
                         branchCode: params.branchCode,
                         containedInPlace: { id: params.containedInPlace.id }
                     })(repos);
                     break;
                 case factory.placeType.MovieTheater:
-                    yield (0, deleteResourcesByMovieTheater_1.deleteResourcesByMovieTheater)({
+                    await (0, deleteResourcesByMovieTheater_1.deleteResourcesByMovieTheater)({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
                     break;
                 case factory.organizationType.Corporation:
-                    yield (0, deleteResourcesBySeller_1.deleteResourcesBySeller)({
+                    await (0, deleteResourcesBySeller_1.deleteResourcesBySeller)({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
                     break;
                 case factory.offerType.AggregateOffer:
-                    yield (0, deleteResourcesByAggregateOffer_1.deleteResourcesByAggregateOffer)({
+                    await (0, deleteResourcesByAggregateOffer_1.deleteResourcesByAggregateOffer)({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
                     break;
                 case 'OfferCatalog':
-                    yield (0, deleteResourcesByOfferCatalog_1.deleteResourcesByOfferCatalog)({
+                    await (0, deleteResourcesByOfferCatalog_1.deleteResourcesByOfferCatalog)({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
-                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                    await (0, syncOfferCatalog_1.syncOfferCatalog)({
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: resourceType,
@@ -145,7 +135,7 @@ function onResourceDeleted(params) {
                 case factory.product.ProductType.Transportation:
                 case factory.product.ProductType.MembershipService:
                 case factory.product.ProductType.PaymentCard:
-                    yield (0, deleteResourcesByProduct_1.deleteResourcesByProduct)({
+                    await (0, deleteResourcesByProduct_1.deleteResourcesByProduct)({
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: resourceType
@@ -153,7 +143,7 @@ function onResourceDeleted(params) {
                     break;
                 // 区分削除に対応(2024-04-18~)
                 case 'CategoryCode':
-                    yield (0, syncCategoryCode_1.syncCategoryCode)({
+                    await (0, syncCategoryCode_1.syncCategoryCode)({
                         project: { id: params.project.id },
                         ids: params.id,
                         isDeleted: true
@@ -164,5 +154,5 @@ function onResourceDeleted(params) {
                     throw new factory.errors.NotImplemented(`${resourceType} onDeleted not implemented`);
             }
         }
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js

@@ -1,27 +1,17 @@
 "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.createInformOfferTasks = createInformOfferTasks;
 const factory = require("../../../factory");
 function createInformOfferTasks(params, setting) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         if (params.ids.length === 0) {
             return;
         }
         // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
-        const offers = yield repos.offer.search({
+        const informResources = setting?.onResourceUpdated?.informResource;
+        const offers = await repos.offer.search({
             id: { $in: params.ids }
         }, { typeOf: 1, name: 1, priceSpecification: 1, additionalProperty: 1, identifier: 1, project: 1 });
         const offers4inform = offers.map(({ id, typeOf, name, priceSpecification, additionalProperty, identifier, project }) => {
@@ -30,16 +20,14 @@ function createInformOfferTasks(params, setting) {
         if (offers4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
-            informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
-                var _a;
-                const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+            informResources?.forEach((informResource) => {
+                const informUrl = String(informResource.recipient?.url);
                 offers4inform.forEach((offer4inform) => {
-                    var _a;
                     const informActionAttributes = {
                         object: offer4inform,
                         recipient: {
                             id: '',
-                            name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            name: String(informResource.recipient?.name),
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
@@ -63,8 +51,8 @@ function createInformOfferTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/onCategoryCodeUpdated.js

@@ -1,13 +1,4 @@
 "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.onCategoryCodeUpdated = onCategoryCodeUpdated;
 const syncCategoryCode_1 = require("./syncCategoryCode");
@@ -15,11 +6,11 @@ const syncCategoryCode_1 = require("./syncCategoryCode");
  * 区分変更時処理
  */
 function onCategoryCodeUpdated(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, syncCategoryCode_1.syncCategoryCode)({
+    return async (repos) => {
+        await (0, syncCategoryCode_1.syncCategoryCode)({
             project: { id: params.project.id },
             ids: params.ids,
             isDeleted: false
         })(repos);
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -1,29 +1,19 @@
 "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.createInformHasPOSTasks = createInformHasPOSTasks;
 const factory = require("../../../factory");
 // import { Settings } from '../../../settings';
 function createInformHasPOSTasks(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         if (params.ids.length !== 1) {
             throw new factory.errors.Argument('id', 'id.length must be 1');
         }
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated']);
         // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
-        const movieTheaters = yield repos.movieTheater.projectFields({
+        const informResources = setting?.onResourceUpdated?.informResource;
+        const movieTheaters = await repos.movieTheater.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -37,7 +27,7 @@ function createInformHasPOSTasks(params) {
         }
         // 施設のhasPOSを全て連携する
         repos.hasPOS.operator.id = movieTheater.id;
-        const hasPOS = yield repos.hasPOS.search({
+        const hasPOS = await repos.hasPOS.search({
             project: { id: { $eq: params.project.id } }
         });
         const movieTheaters4inform = [{
@@ -49,16 +39,14 @@ function createInformHasPOSTasks(params) {
         if (movieTheaters4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
-            informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
-                var _a;
-                const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+            informResources?.forEach((informResource) => {
+                const informUrl = String(informResource.recipient?.url);
                 movieTheaters4inform.forEach((movieTheater4inform) => {
-                    var _a;
                     const informActionAttributes = {
                         object: movieTheater4inform,
                         recipient: {
                             id: '',
-                            name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            name: String(informResource.recipient?.name),
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
@@ -82,8 +70,8 @@ function createInformHasPOSTasks(params) {
                 });
             });
             if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -1,51 +1,39 @@
 "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.createInformOfferCatalogTasks = createInformOfferCatalogTasks;
 exports.onOfferCatalogUpdated = onOfferCatalogUpdated;
 const factory = require("../../../factory");
 const syncOfferCatalog_1 = require("./syncOfferCatalog");
 function createInformOfferCatalogTasks(params, setting) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         if (params.ids.length === 0) {
             return;
         }
         let offerCatalogs = [];
         if (params.isOfferCatalogItem) {
-            offerCatalogs = yield repos.offerCatalogItem.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
+            offerCatalogs = await repos.offerCatalogItem.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
         else {
-            offerCatalogs = yield repos.offerCatalog.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
+            offerCatalogs = await repos.offerCatalog.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
         // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
+        const informResources = setting?.onResourceUpdated?.informResource;
         const offerCatalogs4inform = offerCatalogs.map(({ id, typeOf, name, identifier, project, numberOfItems }) => {
             return { id, typeOf, name, identifier, project, numberOfItems };
         });
         if (offerCatalogs4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
-            informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
-                var _a;
-                const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+            informResources?.forEach((informResource) => {
+                const informUrl = String(informResource.recipient?.url);
                 offerCatalogs4inform.forEach((offerCatalog4inform) => {
-                    var _a;
                     const informActionAttributes = {
                         object: offerCatalog4inform,
                         recipient: {
                             id: '',
-                            name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            name: String(informResource.recipient?.name),
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
@@ -69,22 +57,22 @@ function createInformOfferCatalogTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }
 /**
  * オファーカタログ変更時処理
  */
 function onOfferCatalogUpdated(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+    return async (repos) => {
+        await (0, syncOfferCatalog_1.syncOfferCatalog)({
             project: { id: params.project.id },
             ids: params.ids,
             typeOf: params.typeOf,
             isDeleted: false,
             isOfferCatalogItem: params.isOfferCatalogItem === true
         })(repos);
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -1,13 +1,4 @@
 "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.syncCategoryCode = syncCategoryCode;
 const factory = require("../../../factory");
@@ -15,11 +6,11 @@ const factory = require("../../../factory");
  * 区分を他リソースへ同期する
  */
 function syncCategoryCode(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.isDeleted) {
             for (const categoryCodeId of params.ids) {
                 // プロダクトモデルを削除
-                yield repos.productModel.deleteByCategory({
+                await repos.productModel.deleteByCategory({
                     category: {
                         project: { id: params.project.id, typeOf: factory.organizationType.Project },
                         id: categoryCodeId
@@ -29,7 +20,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.projectCategoryCodeFields({
+                const syncingCategoryCode = (await repos.categoryCode.projectCategoryCodeFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
@@ -39,8 +30,11 @@ function syncCategoryCode(params) {
                     switch (syncingCategoryCode.inCodeSet.identifier) {
                         case factory.categoryCode.CategorySetIdentifier.SeatingType:
                             // プロダクトモデルへ同期
-                            yield repos.productModel.upsertByCategory({
-                                category: Object.assign(Object.assign({}, syncingCategoryCode), { id: categoryCodeId })
+                            await repos.productModel.upsertByCategory({
+                                category: {
+                                    ...syncingCategoryCode,
+                                    id: categoryCodeId
+                                }
                             });
                             break;
                         default:
@@ -49,5 +43,5 @@ function syncCategoryCode(params) {
                 }
             }
         }
-    });
+    };
 }

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js

@@ -1,13 +1,4 @@
 "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.syncOfferCatalog = syncOfferCatalog;
 const factory = require("../../../factory");
@@ -15,15 +6,14 @@ const factory = require("../../../factory");
  * カタログのitemListElementを集計オファーへ同期する
  */
 function syncOfferCatalog(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // if (params.ids.length !== 1) {
         //     throw new factory.errors.Argument('id', 'id.length must be 1');
         // }
-        var _a;
         if (params.isDeleted) {
             for (const offerCatalogId of params.ids) {
                 // カタログを含む全集計オファーからカタログを除外
-                yield repos.aggregateOffer.pullIncludedInDataCatalog({
+                await repos.aggregateOffer.pullIncludedInDataCatalog({
                     project: { id: params.project.id },
                     $pull: {
                         includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
@@ -35,64 +25,68 @@ function syncOfferCatalog(params) {
             for (const offerCatalogId of params.ids) {
                 let offerCatalogs = [];
                 if (params.isOfferCatalogItem) {
-                    offerCatalogs = yield repos.offerCatalogItem.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
+                    offerCatalogs = await repos.offerCatalogItem.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
                 }
                 else {
-                    offerCatalogs = yield repos.offerCatalog.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
+                    offerCatalogs = await repos.offerCatalog.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
                 }
-                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
+                const itemListElementTypeOf = offerCatalogs.shift()?.itemListElementTypeOf;
                 switch (itemListElementTypeOf) {
                     case factory.offerType.Offer:
                         // includedInDataCatalogを単価オファーへ同期
-                        yield syncOfferCatalogOfOffer2offer({
+                        await syncOfferCatalogOfOffer2offer({
                             id: offerCatalogId,
                             project: { id: params.project.id },
                             isOfferCatalogItem: params.isOfferCatalogItem
                         })(repos);
                         // 同期済記録を補完
                         if (params.isOfferCatalogItem) {
-                            yield repos.offerCatalogItem.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                            await repos.offerCatalogItem.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
                         }
                         else {
-                            yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                            await repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
                         }
                         break;
                     case 'OfferCatalog':
                         // 特に何もしない
-                        yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        await repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
                         break;
                     default:
                     // no op
                 }
             }
         }
-    });
+    };
 }
 function syncOfferCatalogOfOffer2offer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 集計オファーIDリストを検索
         let aggregateOfferIds;
         if (params.isOfferCatalogItem) {
-            const { itemListElement } = yield repos.offerCatalogItem.findItemListElementById({
+            const { itemListElement } = await repos.offerCatalogItem.findItemListElementById({
                 id: params.id,
                 project: { id: params.project.id }
             });
             aggregateOfferIds = itemListElement.map((element) => element.id);
         }
         else {
-            const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
+            const { itemListElement } = await repos.offerCatalog.findItemListElementById({
                 id: params.id,
                 project: { id: params.project.id }
             });
             aggregateOfferIds = itemListElement.map((element) => element.id);
         }
         // カタログを含み、かつ、新しいカタログに含まれない集計オファーからカタログを除外
-        yield repos.aggregateOffer.pullIncludedInDataCatalog(Object.assign({ project: { id: params.project.id }, $pull: {
+        await repos.aggregateOffer.pullIncludedInDataCatalog({
+            project: { id: params.project.id },
+            $pull: {
                 includedInDataCatalog: { $elemMatch: { id: { $eq: params.id } } }
-            } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
+            },
+            ...(aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined
+        });
         if (aggregateOfferIds.length > 0) {
             // 新しいカタログに含まれる全集計オファーにカタログを追加
-            yield repos.aggregateOffer.pushIncludedInDataCatalog({
+            await repos.aggregateOffer.pushIncludedInDataCatalog({
                 project: { id: params.project.id },
                 id: { $in: aggregateOfferIds },
                 $push: {
@@ -100,5 +94,5 @@ function syncOfferCatalogOfOffer2offer(params) {
                 }
             });
         }
-    });
+    };
 }