@chevre/factory 4.381.0-alpha.2 → 4.381.0-alpha.3

package/lib/assetTransaction/reserve.d.ts

@@ -21,7 +21,17 @@ export type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<Ass
  * 取引開始パラメータ
  */
 export type IStartParams = AssetTransactionFactory.IStartParams<AssetTransactionType.Reserve, IAgent, undefined, IObject>;
-export interface IProgramMembershipUsedAsPermit {
+export interface IPermitIssuedThroughFaceToFace {
+    /**
+     * メンバーシップコード
+     */
+    identifier: string;
+    issuedThrough: {
+        typeOf: PaymentServiceType.FaceToFace;
+    };
+    typeOf: PermitType.Permit;
+}
+export interface IPermitIssuedThroughMembershipService {
     accessCode?: string;
     /**
      * メンバーシップコード
@@ -32,7 +42,7 @@ export interface IProgramMembershipUsedAsPermit {
          * メンバーシップ発行サービスID
          */
         id: string;
-        typeOf: ProductType.MembershipService | PaymentServiceType.CreditCard | PaymentServiceType.FaceToFace;
+        typeOf: ProductType.MembershipService | PaymentServiceType.CreditCard;
     };
     typeOf: PermitType.Permit;
 }
@@ -50,7 +60,7 @@ export type ITokenizedProgramMembershipUsed = string;
 /**
  * 適用メンバーシップ
  */
-export type IAcceptedProgramMembershipUsed = IProgramMembershipUsedAsPermit | IProgramMembershipUsedAsTicket | ITokenizedProgramMembershipUsed;
+export type IAcceptedProgramMembershipUsed = IPermitIssuedThroughFaceToFace | IPermitIssuedThroughMembershipService | IProgramMembershipUsedAsTicket | ITokenizedProgramMembershipUsed;
 export type IAcceptedSubReservation = ISubReservation4eventReservation;
 export interface IAcceptedPointAward {
     typeOf: ActionType.MoneyTransfer;

package/lib/authorization.d.ts

@@ -2,12 +2,12 @@ import { CreativeWorkType } from './creativeWorkType';
 import { IMember, IMemberOfRole } from './iam';
 import { IOrder } from './order';
 import { OrganizationType } from './organizationType';
-import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThrough, IReservation } from './ownershipInfo';
+import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThroughAsFaceToFace, IPermitIssuedThroughAsProduct, IReservation } from './ownershipInfo';
 import { PersonType } from './personType';
 import { IProject } from './project';
 import { SortType } from './sortType';
 export type IOrderAsObject = Pick<IOrder, 'orderNumber' | 'typeOf'>;
-export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThrough, 'id' | 'typeOf'>;
+export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAsFaceToFace, 'typeOf'> | Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
 export type IPermitAsObjectTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
     issuedThrough?: IPermitIssuedThroughOfObjectTypeOfGood;
 };

package/lib/ownershipInfo.d.ts

@@ -52,7 +52,9 @@ export interface IEventReservationAsGood {
  */
 export type IReservation = IBusReservationAsGood | IEventReservationAsGood;
 export type IReservationWithDetail = (IEventReservationAsGood & IEventReservation) | (IBusReservationAsGood & IBusReservation);
-export type IPermitIssuedThrough = Pick<PermitFactory.IIssuedThrough, 'id' | 'typeOf' | 'serviceType'>;
+export type IPermitIssuedThroughAsFaceToFace = Pick<PermitFactory.IIssuedThroughAsFaceToFace, 'typeOf'>;
+export type IPermitIssuedThroughAsProduct = Pick<PermitFactory.IIssuedThroughAsProduct, 'id' | 'typeOf' | 'serviceType'> | Pick<PermitFactory.IIssuedThroughAsCreditCard, 'id' | 'typeOf' | 'serviceType'>;
+export type IPermitIssuedThrough = IPermitIssuedThroughAsFaceToFace | IPermitIssuedThroughAsProduct;
 export type IPermitAsGood = Pick<PermitFactory.IPermit, 'identifier' | 'typeOf' | 'name' | 'validFor'> & {
     identifier: string;
     issuedThrough?: IPermitIssuedThrough;

package/lib/permit.d.ts

@@ -8,18 +8,21 @@ import { PaymentServiceType } from './service/paymentService';
 export declare enum PermitType {
     Permit = "Permit"
 }
-export type IIssuedThroughAsPaymentService = Pick<IProduct, 'id' | 'serviceType'> & {
+export interface IIssuedThroughAsFaceToFace {
+    typeOf: PaymentServiceType.FaceToFace;
+}
+export type IIssuedThroughAsCreditCard = Pick<IProduct, 'id' | 'serviceType'> & {
     /**
      * 決済サービスID
      */
     id: string;
-    typeOf: PaymentServiceType.CreditCard | PaymentServiceType.FaceToFace;
+    typeOf: PaymentServiceType.CreditCard;
 };
 export type IIssuedThroughAsProduct = Pick<IProduct, 'id' | 'serviceType' | 'typeOf'> & {
     id: string;
     typeOf: ProductType.MembershipService | ProductType.PaymentCard;
 };
-export type IIssuedThrough = IIssuedThroughAsPaymentService | IIssuedThroughAsProduct;
+export type IIssuedThrough = IIssuedThroughAsFaceToFace | IIssuedThroughAsCreditCard | IIssuedThroughAsProduct;
 export type IPaymentAccount = Pick<IAccount, 'accountNumber' | 'typeOf'>;
 export type IPaymentAccountWithDetail = Pick<IAccount, 'accountNumber' | 'availableBalance' | 'balance' | 'typeOf'>;
 export type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;

package/lib/reservation.d.ts

@@ -166,7 +166,6 @@ export interface IBroker {
 export type IProgramMembershipUsedIssuedThroughFaceToFace = Pick<IPermit, 'typeOf'> & {
     identifier: string;
     issuedThrough: {
-        id: string;
         typeOf: PaymentServiceType.FaceToFace;
     };
 };

package/lib/service/paymentService.d.ts

@@ -1,6 +1,6 @@
 import { IInvoice } from '../invoice';
 import { IMultilingualString } from '../multilingualString';
-import { IIssuedThrough, IPermit } from '../permit';
+import { IIssuedThroughAsCreditCard, IPermit } from '../permit';
 import { IAvailableChannel as IProductAvailableChannel, ISearchConditions as ISearchProductConditions, IServiceType } from '../product';
 import { IProject } from '../project';
 import { IPropertyValue } from '../propertyValue';
@@ -98,7 +98,7 @@ export type IPermitAsServiceOutput = Pick<IPermit, 'typeOf'> & {
      * メンバーシップサービス
      * メンバーシップ区分が含まれる
      */
-    issuedThrough: Pick<IIssuedThrough, 'serviceType'>;
+    issuedThrough: Pick<IIssuedThroughAsCreditCard, 'serviceType'>;
 };
 export type IServiceOutput = IInvoiceAsServiceOutput | IPermitAsServiceOutput;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.381.0-alpha.2",
+  "version": "4.381.0-alpha.3",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",