@chevre/domain 21.13.0-alpha.9 → 21.14.0

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

@@ -23,6 +23,7 @@ const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const place_1 = require("../../repo/place");
+const hasPOS_1 = require("../../repo/place/hasPOS");
 const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
@@ -43,6 +44,7 @@ function call(data) {
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
+            hasPOS: new hasPOS_1.MongoRepository(connectionSettings.connection, { id: '' }),
             member: new member_1.MongoRepository(connectionSettings.connection),
             offer: new offer_1.MongoRepository(connectionSettings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(connectionSettings.connection),
@@ -290,7 +292,7 @@ function createInformMovieTheaterTasks(params) {
             'additionalProperty',
             'branchCode',
             'hasEntranceGate',
-            'hasPOS',
+            // 'hasPOS',
             'kanaName',
             'name',
             'parentOrganization',

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -87,19 +87,12 @@ function createPaymentMethods(params) {
         const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
             { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
             : undefined);
-        paymentMethods.push({
-            accountId: resultAsInvoice.accountId,
-            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
-            issuedThrough: resultAsInvoice.issuedThrough,
-            name: resultAsInvoice.name,
-            paymentMethodId: resultAsInvoice.paymentMethodId,
-            paymentStatus: resultAsInvoice.paymentStatus,
-            totalPaymentDue: resultAsInvoice.totalPaymentDue,
-            typeOf: paymentMethodType,
+        paymentMethods.push(Object.assign({ accountId: resultAsInvoice.accountId, additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [], issuedThrough: resultAsInvoice.issuedThrough, name: resultAsInvoice.name, paymentMethodId: resultAsInvoice.paymentMethodId, paymentStatus: resultAsInvoice.paymentStatus, totalPaymentDue: resultAsInvoice.totalPaymentDue, 
             // CreditCardIFのカード通貨区分を追加(2023-08-15~)
             // 決済方法区分を保証(2023-08-28~)
-            paymentMethod: paymentMethodOfInvoice
-        });
+            paymentMethod: paymentMethodOfInvoice }, {
+            typeOf: paymentMethodType // IFとして廃止だが、互換性維持対応として(2023-10-30~)
+        }));
     });
     // 決済方法から注文金額の計算
     price += authorizePaymentActions

package/package.json

@@ -9,8 +9,9 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.335.0",
-    "@cinerino/sdk": "4.0.0-alpha.1",
+    "@aws-sdk/credential-providers": "3.433.0",
+    "@chevre/factory": "4.337.0",
+    "@cinerino/sdk": "5.0.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -33,6 +34,7 @@
   },
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
+    "@aws-sdk/client-cognito-identity-provider": "^3.433.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
     "@types/http-status": "^0.2.30",
@@ -51,7 +53,6 @@
     "@types/sinon-mongoose": "^1.3.11",
     "@types/uniqid": "^4.1.3",
     "@types/uuid": "^3.4.10",
-    "aws-sdk": "2.1348.0",
     "coveralls": "^3.1.0",
     "csvtojson": "^2.0.10",
     "googleapis": "^85.0.0",
@@ -72,7 +73,7 @@
     "typescript": "5.0.3"
   },
   "peerDependencies": {
-    "aws-sdk": "^2.0.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.433.0",
     "mongoose": "^7.0.5",
     "redis": "^4.6.5"
   },
@@ -81,6 +82,7 @@
     "npm": ">=6.0.0"
   },
   "keywords": [],
+  "license": "UNLICENSED",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
@@ -115,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.9"
+  "version": "21.14.0"
 }

package/example/src/chevre/csv2json.ts

@@ -1,57 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-// import * as mongoose from 'mongoose';
-// tslint:disable-next-line:no-implicit-dependencies
-import * as csv from 'csvtojson';
-import * as fs from 'fs';
-import * as json2csv from 'json2csv';
-
-import { chevre } from '../../../lib/index';
-
-const csvFilePath = `${__dirname}/transactions.csv`;
-
-async function main() {
-
-    const personRepo = new chevre.repository.Person({
-        userPoolId: ''
-    });
-
-    const transactions = await csv()
-        .fromFile(csvFilePath);
-    console.log(transactions);
-
-    const reports = [];
-    for (const transaction of transactions) {
-        const people = await personRepo.search({
-            id: transaction.personId
-        });
-        console.log(people.length, people[0]?.memberOf?.membershipNumber, 'people found');
-
-        reports.push({
-            id: transaction.id,
-            transactionNumber: transaction.transactionNumber,
-            startDate: transaction.startDate,
-            personId: transaction.personId,
-            username: people[0]?.memberOf?.membershipNumber
-        });
-    }
-    // console.log(reports);
-    console.log(reports.length);
-    const fields = ['id', 'transactionNumber', 'startDate', 'personId', 'username'];
-    const opts = { fields };
-
-    try {
-        const usernamesCsv = json2csv.parse(reports, opts);
-        const usernameCsvPath = `${__dirname}/usernames.csv`;
-        // tslint:disable-next-line:non-literal-fs-path
-        fs.writeFileSync(usernameCsvPath, usernamesCsv);
-    } catch (err) {
-        console.error(err);
-    }
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

package/example/src/chevre/deleteMovieTicketCategoryChargePriceSpecs.ts

@@ -1,21 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: process.env.PROJECT_ID };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
-
-    const result = await priceSpecificationRepo.deleteUnnecessaryMovieTicketTypeChargePriceSpecs({
-        project: { id: project.id }
-    });
-    console.log('deleted', result);
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/person/createInformTask.ts

@@ -1,77 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-type IPermitOwnershipInfo = chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermitAsGood>;
-
-const project = { id: <string>process.env.PROJECT_ID };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const now = new Date();
-
-    const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
-    const newPersonRepo = new chevre.repository.Person({
-        userPoolId: <string>process.env.USERPOOL_ID_NEW
-    });
-    const oldPersonRepo = new chevre.repository.Person({
-        userPoolId: <string>process.env.USERPOOL_ID_OLD
-    });
-
-    const id = 'a7909268-a584-425e-8212-d7d10f344093';
-
-    const profile = await newPersonRepo.findById({
-        userId: id
-    });
-    console.log('profile found');
-
-    let oldUser;
-    const userIdentitiesStr = profile.additionalProperty?.find((p) => p.name === 'identities')?.value;
-    if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
-        try {
-            const identities = JSON.parse(userIdentitiesStr);
-            if (Array.isArray(identities) && identities.length > 0) {
-                const userIdByIdentities = identities[0].userId;
-                if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
-                    // oldUserは必ず存在するはず
-                    oldUser = await oldPersonRepo.findById({ userId: userIdByIdentities });
-                }
-            }
-        } catch (error) {
-            // tslint:disable-next-line:no-console
-            console.error('person2username throwed', error);
-            throw error;
-        }
-    }
-
-    const paymentCardOwnershipInfos = <IPermitOwnershipInfo[]>
-        await ownershipInfoRepo.search({
-            sort: { ownedFrom: chevre.factory.sortType.Ascending },
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            ownedFrom: now,
-            ownedThrough: now,
-            ownedBy: { id },
-            typeOfGood: {
-                issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.PaymentCard } }
-            }
-        });
-    const paymentCardOwnershipInfo = paymentCardOwnershipInfos.shift();
-    console.log('paymentCard found');
-
-    console.log({
-        id,
-        // ...profile,
-        accountNumber: paymentCardOwnershipInfo?.typeOfGood.identifier,
-        ...oldUser
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

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

@@ -1,76 +0,0 @@
-// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = placeRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: {
-                $eq: chevre.factory.placeType.MovieTheater
-            }
-            // organizer: { $exists: false }
-        },
-        {
-            branchCode: 1,
-            _id: 1, name: 1, project: 1, hasPOS: 1
-        }
-    );
-    console.log('places found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const movieTheater: Pick<chevre.factory.place.movieTheater.IPlace,
-            'branchCode' | 'id' | 'name' | 'project' | 'hasPOS'> = doc.toObject();
-        console.log(movieTheater);
-
-        if (!Array.isArray(movieTheater.hasPOS)) {
-            console.log('has no pos', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
-        } else {
-            const alreadyMigrated = movieTheater.hasPOS.every((pos) => pos.branchCode === pos.id);
-            if (alreadyMigrated) {
-                console.log('already migrated...', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
-            } else {
-                if (movieTheater.hasPOS.length > 0) {
-                    const newHasPOS: chevre.factory.place.movieTheater.IPOS[] = movieTheater.hasPOS.map((pos) => {
-                        return {
-                            id: pos.id,
-                            branchCode: pos.id,
-                            name: pos.name
-                        };
-                    });
-                    console.log('updating place...', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i, newHasPOS);
-                    await placeRepo.saveMovieTheater(<any>{
-                        project: movieTheater.project,
-                        branchCode: movieTheater.branchCode,
-                        id: movieTheater.id,
-                        typeOf: chevre.factory.placeType.MovieTheater,
-                        hasPOS: newHasPOS
-                    });
-                    updateCount += 1;
-                    console.log('updated.', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
-                }
-            }
-        }
-    });
-
-    console.log(i, 'places checked');
-    console.log(updateCount, 'places updated');
-}
-
-main()
-    .then()
-    .catch(console.error);