@chevre/domain 23.2.0-alpha.23 → 23.2.0-alpha.25

package/example/src/chevre/place/upsertMovieTheatersByBranchCode.ts

@@ -0,0 +1,43 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../../lib/index';
+
+const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
+
+    const result = await movieTheaterRepo.upsertMovieTheatersByBranchCode(
+        [
+            {
+                $set: {
+                    branchCode: 'SAMPLE',
+                    name: { ja: 'sampleNameJa', en: 'from samples' },
+                    additionalProperty: [],
+                    kanaName: '',
+                    telephone: '',
+                    offers: {
+                        typeOf: chevre.factory.offerType.Offer,
+                        eligibleQuantity: { maxValue: 6, unitCode: chevre.factory.unitCode.C62, typeOf: 'QuantitativeValue' },
+                        availabilityEndsGraceTime: { value: 6, unitCode: chevre.factory.unitCode.Sec, typeOf: 'QuantitativeValue' },
+                        availabilityStartsGraceTime: { value: 6, unitCode: chevre.factory.unitCode.Day, typeOf: 'QuantitativeValue' },
+                        availabilityEndsGraceTimeOnPOS: { value: 6, unitCode: chevre.factory.unitCode.Sec, typeOf: 'QuantitativeValue' },
+                        availabilityStartsGraceTimeOnPOS: { value: 6, unitCode: chevre.factory.unitCode.Day, typeOf: 'QuantitativeValue' }
+                    }
+
+                }
+            }
+        ],
+        {
+            project: { id: project.id },
+            sellerId: '59d20831e53ebc2b4e774466'
+        }
+    );
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/place/movieTheater.d.ts

@@ -1,3 +1,4 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../../factory';
 import { IDocType } from '../mongoose/schemas/civicStructure';
@@ -5,10 +6,23 @@ export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.I
 export type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf'> & {
     containsPlace: factory.place.screeningRoom.IPlace[];
 };
-type IKeyOfProjection = keyof factory.place.movieTheater.IPlace | 'offers.availabilityStartsGraceTime' | 'offers.availabilityEndsGraceTime';
+type IKeyOfProjection = keyof factory.place.movieTheater.IPlace | 'offers.typeOf' | 'offers.eligibleQuantity' | 'offers.availabilityStartsGraceTime' | 'offers.availabilityEndsGraceTime';
 type IMovieTheaterPublicAttributes = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'id' | 'kanaName' | 'name' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
     offers?: Pick<factory.place.movieTheater.IOffer, 'availabilityEndsGraceTime' | 'availabilityStartsGraceTime'>;
 };
+type IUpsertingMovieTheater = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'telephone' | 'url'> & {
+    hasEntranceGate?: never;
+    hasPOS?: never;
+};
+interface IUpsertOptions {
+    project: {
+        id: string;
+    };
+    /**
+     * 施設の所属販売者ID
+     */
+    sellerId: string;
+}
 /**
  * 施設リポジトリ
  */
@@ -25,6 +39,18 @@ export declare class MovieTheaterRepo {
         id: string;
     }>;
     saveMovieTheaterByBranchCode4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-13~
+     */
+    upsertMovieTheatersByBranchCode(params: {
+        $set: IUpsertingMovieTheater;
+        $unset?: {
+            [key in keyof IUpsertingMovieTheater]?: 1;
+        };
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * 施設のpublic属性検索
      * 2024-09-18~

package/lib/chevre/repo/place/movieTheater.js

@@ -27,6 +27,8 @@ const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 const AVAILABLE_PROJECT_FIELDS = [
     'additionalProperty', 'branchCode', 'hasEntranceGate', 'kanaName', 'name',
     'offers', 'parentOrganization', 'project', 'telephone', 'typeOf', 'url',
+    'offers.typeOf',
+    'offers.eligibleQuantity',
     'offers.availabilityStartsGraceTime',
     'offers.availabilityEndsGraceTime'
 ];
@@ -39,7 +41,7 @@ class MovieTheaterRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const andConditions = [{ typeOf: { $eq: factory.placeType.MovieTheater } }];
         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') {
@@ -73,11 +75,15 @@ class MovieTheaterRepo {
                 ]
             });
         }
-        const parentOrganizationIdEq = (_h = (_g = params.parentOrganization) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const sellerIdEq = (_h = (_g = params.seller) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        if (typeof sellerIdEq === 'string') {
+            andConditions.push({ 'parentOrganization.id': { $exists: true, $eq: sellerIdEq } });
+        }
+        const parentOrganizationIdEq = (_k = (_j = params.parentOrganization) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof parentOrganizationIdEq === 'string') {
             andConditions.push({ 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } });
         }
-        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -132,6 +138,50 @@ class MovieTheaterRepo {
             }
         });
     }
+    /**
+     * コードをキーにして冪等作成
+     * 2026-01-13~
+     */
+    upsertMovieTheatersByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, sellerId } = options;
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { branchCode, hasEntranceGate, hasPOS } = $set, // 入場ゲート,POSを決して編集しないように
+                    setFields = __rest($set, ["branchCode", "hasEntranceGate", "hasPOS"]);
+                    if (typeof branchCode !== 'string' || branchCode === '') {
+                        throw new factory.errors.ArgumentNull('branchCode');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        typeOf: { $eq: factory.placeType.MovieTheater },
+                        'project.id': { $eq: project.id },
+                        branchCode: { $eq: branchCode }
+                    };
+                    const initialMovieTheater = {
+                        typeOf: factory.placeType.MovieTheater,
+                        project: { id: project.id, typeOf: factory.organizationType.Project },
+                        branchCode,
+                        parentOrganization: { id: sellerId, typeOf: factory.organizationType.Corporation }
+                    };
+                    const setOnInsert = initialMovieTheater;
+                    const update = Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                    const updateOne = {
+                        filter,
+                        update,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+            return {};
+        });
+    }
     /**
      * 施設のpublic属性検索
      * 2024-09-18~

package/lib/chevre/service/offer.js

@@ -58,6 +58,7 @@ function addOffers2Seat(params) {
  * イベントに対する座席オファーを検索する
  */
 function searchEventSeatOffersWithPaging(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const { useDefaultSection } = params.options;
@@ -115,14 +116,26 @@ function searchEventSeatOffersWithPaging(params) {
                         };
                     })
                 });
-                offers = seats.map((seat, index) => {
-                    return addOffers2Seat({
-                        seat,
-                        availability: (typeof availabilities[index] === 'string')
-                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
-                            : factory.itemAvailability.InStock,
-                        priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
-                    });
+                offers = seats.map(({ branchCode, name, containedInPlace, seatingType }, index) => {
+                    // デフォルトセクション指定の場合、first elementのみセクションコードを含める
+                    const includeSectionCode = !useDefaultSection
+                        || (useDefaultSection && index === 0);
+                    return Object.assign({ branchCode,
+                        name,
+                        seatingType, 
+                        // ...seat,
+                        offers: [{
+                                availability: (typeof availabilities[index] === 'string')
+                                    ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                                    : factory.itemAvailability.InStock
+                            }] }, (includeSectionCode) ? { containedInPlace } : undefined);
+                    // return addOffers2Seat({
+                    //     seat,
+                    //     availability: (typeof availabilities[index] === 'string')
+                    //         ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                    //         : factory.itemAvailability.InStock,
+                    //     priceSpecs: [] // priceSpecsをレスポンスから廃止(2024-12-22~)
+                    // });
                 });
             }
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.13",
+    "@chevre/factory": "5.4.0-alpha.14",
     "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.23"
+  "version": "23.2.0-alpha.25"
 }