@chevre/domain 20.1.0-alpha.43 → 20.1.0-alpha.45

package/example/src/chevre/deleteReservationTicketUnderNames.ts

@@ -0,0 +1,20 @@
+// 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);
+
+    const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
+
+    const result = await reservationRepo.deleteReservedTicketUnderName();
+
+    console.log('deleted', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/factory/reservedAgentIdentifireNames.d.ts

@@ -0,0 +1 @@
+export declare const RESERVED_AGENT_IDENTIFIER_NAMES: string[];

package/lib/chevre/factory/reservedAgentIdentifireNames.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RESERVED_AGENT_IDENTIFIER_NAMES = void 0;
+exports.RESERVED_AGENT_IDENTIFIER_NAMES = [
+    'orderNumber',
+    'tokenIssuer',
+    'iss',
+    'clientId',
+    'sub',
+    'hostname',
+    'username'
+];

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

@@ -115,4 +115,5 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<string[]>;
+    deleteReservedTicketUnderName(): Promise<UpdateWriteOpResult>;
 }

package/lib/chevre/repo/reservation.js

@@ -1087,5 +1087,17 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc._id.toString()));
         });
     }
+    deleteReservedTicketUnderName() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = {
+                'reservedTicket.underName': { $exists: true }
+            };
+            const update = {
+                $unset: { 'reservedTicket.underName': 1 }
+            };
+            return this.reservationModel.updateMany(conditions, update)
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -21,6 +21,7 @@ const util_1 = require("util");
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const reservedAgentIdentifireNames_1 = require("../../../factory/reservedAgentIdentifireNames");
 const settings_1 = require("../../../settings");
 const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
 function getOrderWithToken(params) {
@@ -132,7 +133,12 @@ function creteOrder4inform(order) {
         // mask
         customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
             // identifierは必要
-            identifier: (Array.isArray(order.customer.identifier)) ? order.customer.identifier : [] }), 
+            // 予約後を隠蔽(2022-12-24~)
+            identifier: (Array.isArray(order.customer.identifier))
+                ? order.customer.identifier.filter((p) => {
+                    return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
+                })
+                : [] }), 
         // paymentMethodsに関してもmask(2022-05-30~)
         paymentMethods: order.paymentMethods.map((p) => {
             return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)

package/lib/chevre/service/reserve/factory.d.ts

@@ -1,5 +1,4 @@
 import * as factory from '../../factory';
-export declare const RESERVED_AGENT_IDENTIFIER_NAMES: string[];
 declare type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
 export declare function maskUnderName(reservation: IEventReservation): IEventReservation;
 export interface IProject {

package/lib/chevre/service/reserve/factory.js

@@ -1,27 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = exports.RESERVED_AGENT_IDENTIFIER_NAMES = void 0;
-exports.RESERVED_AGENT_IDENTIFIER_NAMES = [
-    'orderNumber',
-    'tokenIssuer',
-    'iss',
-    'clientId',
-    'sub',
-    'hostname',
-    'username'
-];
+exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
+const reservedAgentIdentifireNames_1 = require("../../factory/reservedAgentIdentifireNames");
 const MASKED_PROFILE = '****';
 function maskUnderName(reservation) {
-    var _a;
-    const underName = (typeof ((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? Object.assign(Object.assign({}, reservation.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE }) : undefined;
-    // 不要なidentifierをmask(2022-12-24~)
-    const identifiers = (Array.isArray(reservation.identifier))
-        ? reservation.identifier.filter((p) => {
-            return !exports.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
+    var _a, _b, _c;
+    // 予約後を隠蔽(2022-12-24~)
+    const underNameIdentifiers = (Array.isArray((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.identifier))
+        ? (_b = reservation.underName) === null || _b === void 0 ? void 0 : _b.identifier.filter((p) => {
+            return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
         })
         : undefined;
-    return Object.assign(Object.assign(Object.assign({}, reservation), (Array.isArray(identifiers)) ? { identifier: identifiers } : undefined), (underName !== undefined) ? { underName } : undefined);
+    const underName = (typeof ((_c = reservation.underName) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string')
+        ? Object.assign(Object.assign(Object.assign({}, reservation.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE }), (Array.isArray(underNameIdentifiers)) ? { identifier: underNameIdentifiers } : undefined) : undefined;
+    return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);
 }
 exports.maskUnderName = maskUnderName;
 exports.NUM_TRY_INFORM_RESERVATION = 10;

package/lib/chevre/service.d.ts

@@ -3,6 +3,7 @@
  */
 import * as AccountTransactionIdentifierFactory from './factory/accountTransactionIdentifier';
 import * as OrderFactory from './factory/order';
+import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
 import * as AccountService from './service/account';
 import * as AccountTransactionService from './service/accountTransaction';
 import * as AggregationService from './service/aggregation';
@@ -46,4 +47,5 @@ export import util = UtilService;
 export declare namespace factory {
     export import accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     export import order = OrderFactory;
+    export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
 }

package/lib/chevre/service.js

@@ -6,6 +6,7 @@ exports.factory = exports.util = exports.transaction = exports.task = exports.re
  */
 const AccountTransactionIdentifierFactory = require("./factory/accountTransactionIdentifier");
 const OrderFactory = require("./factory/order");
+const ReservedAgentIdentifireNamesFactory = require("./factory/reservedAgentIdentifireNames");
 const AccountService = require("./service/account");
 const AccountTransactionService = require("./service/accountTransaction");
 const AggregationService = require("./service/aggregation");
@@ -52,4 +53,5 @@ var factory;
     factory.accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     // tslint:disable-next-line:no-shadowed-variable
     factory.order = OrderFactory;
+    factory.reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
 })(factory = exports.factory || (exports.factory = {}));

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.43"
+  "version": "20.1.0-alpha.45"
 }

package/example/src/chevre/deleteEvents.ts

@@ -1,50 +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) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            // 'superEvent.location.branchCode': { $eq: '118', $exists: true },
-            endDate: {
-                $exists: true,
-                $lt: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        console.log('deleting event...', event.project.id, event.id, event.startDate, i);
-        await eventRepo.deleteById({ id: event.id });
-        updateCount += 1;
-        console.log('deleted', event.project.id, event.id, event.startDate, i);
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);