@bondsports/types 2.3.68 → 2.3.70-a-1

package/dist/types/entity/TeamMember.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../customers-merge/entities/CustomerMerge';
 import { TeamMemberRoleEnum, TeamMemberStatusEnum } from '../services/enums.service';
 import { User } from '../user/entities/User';
 import { BondBaseEntity } from './BondBaseEntity';
@@ -9,4 +10,6 @@ export declare class TeamMember extends BondBaseEntity {
     status: TeamMemberStatusEnum | null;
     role: TeamMemberRoleEnum;
     user: User;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/entity/TeamMember.js.map

@@ -1 +1 @@
-{"version":3,"file":"TeamMember.js","sourceRoot":"","sources":["../../../src/types/entity/TeamMember.ts"],"names":[],"mappings":";;;AAKA,qDAAkD;AAElD,MAAa,UAAW,SAAQ,+BAAc;CAc7C;AAdD,gCAcC"}
+{"version":3,"file":"TeamMember.js","sourceRoot":"","sources":["../../../src/types/entity/TeamMember.ts"],"names":[],"mappings":";;;AAMA,qDAAkD;AAElD,MAAa,UAAW,SAAQ,+BAAc;CAkB7C;AAlBD,gCAkBC"}

package/dist/types/entity/UserInFamilyAccount.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../customers-merge/entities/CustomerMerge';
 import { User } from '../user/entities/User';
 import { BondBaseEntity } from './BondBaseEntity';
 import { FamilyAccount } from './FamilyAccount';
@@ -8,4 +9,6 @@ export declare class UserInFamilyAccount extends BondBaseEntity {
     user: User;
     familyAccount: FamilyAccount;
     deletedAt?: Date;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/entity/UserInFamilyAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserInFamilyAccount.js","sourceRoot":"","sources":["../../../src/types/entity/UserInFamilyAccount.ts"],"names":[],"mappings":";;;AAIA,qDAAkD;AAGlD,MAAa,mBAAoB,SAAQ,+BAAc;CAYtD;AAZD,kDAYC"}
+{"version":3,"file":"UserInFamilyAccount.js","sourceRoot":"","sources":["../../../src/types/entity/UserInFamilyAccount.ts"],"names":[],"mappings":";;;AAKA,qDAAkD;AAGlD,MAAa,mBAAoB,SAAQ,+BAAc;CAgBtD;AAhBD,kDAgBC"}

package/dist/types/entity/user-payment-method.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../customers-merge/entities/CustomerMerge';
 import { PaymentMethodTypeEnum, SubPaymentMethodTypeEnum } from '../payment/types/enums/payment.enums';
 import { BondBaseEntity } from './BondBaseEntity';
 export declare class UserPaymentMethod extends BondBaseEntity {
@@ -14,4 +15,6 @@ export declare class UserPaymentMethod extends BondBaseEntity {
     expYear?: number;
     expMonth?: number;
     deletedAt?: Date;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/entity/user-payment-method.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-payment-method.js","sourceRoot":"","sources":["../../../src/types/entity/user-payment-method.ts"],"names":[],"mappings":";;;AAIA,qDAAkD;AAElD,MAAa,iBAAkB,SAAQ,+BAAc;CA0BpD;AA1BD,8CA0BC"}
+{"version":3,"file":"user-payment-method.js","sourceRoot":"","sources":["../../../src/types/entity/user-payment-method.ts"],"names":[],"mappings":";;;AAKA,qDAAkD;AAElD,MAAa,iBAAkB,SAAQ,+BAAc;CA8BpD;AA9BD,8CA8BC"}

package/dist/types/familyAccount/dto/familyWithMembers.dto.d.ts

@@ -0,0 +1,8 @@
+import { SimpleCustomerDto } from '../../customers/dto/customer-response.dto';
+import { IdAndNameDto } from '../../dto/general.dto';
+export declare class CustomerInFamilyDto extends SimpleCustomerDto {
+    isAdmin: boolean;
+}
+export declare class FamilyWithMembersCustomersDto extends IdAndNameDto {
+    members?: CustomerInFamilyDto[];
+}

package/dist/types/familyAccount/dto/familyWithMembers.dto.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FamilyWithMembersCustomersDto = exports.CustomerInFamilyDto = void 0;
+const customer_response_dto_1 = require("../../customers/dto/customer-response.dto");
+const general_dto_1 = require("../../dto/general.dto");
+class CustomerInFamilyDto extends customer_response_dto_1.SimpleCustomerDto {
+}
+exports.CustomerInFamilyDto = CustomerInFamilyDto;
+class FamilyWithMembersCustomersDto extends general_dto_1.IdAndNameDto {
+}
+exports.FamilyWithMembersCustomersDto = FamilyWithMembersCustomersDto;
+//# sourceMappingURL=familyWithMembers.dto.js.map

package/dist/types/familyAccount/dto/familyWithMembers.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"familyWithMembers.dto.js","sourceRoot":"","sources":["../../../../src/types/familyAccount/dto/familyWithMembers.dto.ts"],"names":[],"mappings":";;;AACA,qFAA8E;AAC9E,uDAAqD;AAErD,MAAa,mBAAoB,SAAQ,yCAAiB;CAEzD;AAFD,kDAEC;AAED,MAAa,6BAA8B,SAAQ,0BAAY;CAE9D;AAFD,sEAEC"}

package/dist/types/familyAccount/dto/getFamilies.dto.d.ts

@@ -1,5 +1,10 @@
+import { IdsQueryDto } from '../../dto/general.dto';
 import { FamilyAccount } from '../../entity/FamilyAccount';
 import { TUserInOrganization } from '../../user/entities/User';
+import { FamilyAccountExpandsEnum } from '../enums';
+export declare class FamilyAccountExpandQueryDto extends IdsQueryDto {
+    expand?: FamilyAccountExpandsEnum[];
+}
 export declare class GetFamilyAccountsResponseDto {
     data: FamilyAccount[];
 }

package/dist/types/familyAccount/dto/getFamilies.dto.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetFamilyMembersResponseDto = exports.GetFamilyAccountsResponseDto = void 0;
+exports.GetFamilyMembersResponseDto = exports.GetFamilyAccountsResponseDto = exports.FamilyAccountExpandQueryDto = void 0;
+const general_dto_1 = require("../../dto/general.dto");
+class FamilyAccountExpandQueryDto extends general_dto_1.IdsQueryDto {
+}
+exports.FamilyAccountExpandQueryDto = FamilyAccountExpandQueryDto;
 class GetFamilyAccountsResponseDto {
 }
 exports.GetFamilyAccountsResponseDto = GetFamilyAccountsResponseDto;

package/dist/types/familyAccount/dto/getFamilies.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFamilies.dto.js","sourceRoot":"","sources":["../../../../src/types/familyAccount/dto/getFamilies.dto.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;CAExC;AAFD,oEAEC;AAED,MAAa,2BAA2B;CAEvC;AAFD,kEAEC"}
+{"version":3,"file":"getFamilies.dto.js","sourceRoot":"","sources":["../../../../src/types/familyAccount/dto/getFamilies.dto.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAKpD,MAAa,2BAA4B,SAAQ,yBAAW;CAE3D;AAFD,kEAEC;AAED,MAAa,4BAA4B;CAExC;AAFD,oEAEC;AAED,MAAa,2BAA2B;CAEvC;AAFD,kEAEC"}

package/dist/types/familyAccount/dto/index.d.ts

@@ -6,6 +6,7 @@ export * from './removeFamilyMember.dto';
 export * from './addFamilyMember.dto';
 export * from './createFamilyAccount.dto';
 export * from './familyAccount.dto';
+export * from './familyWithMembers.dto';
 export * from './getFamilies.dto';
 export * from './index';
 export * from './removeFamilyMember.dto';

package/dist/types/familyAccount/dto/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./removeFamilyMember.dto"), exports);
 __exportStar(require("./addFamilyMember.dto"), exports);
 __exportStar(require("./createFamilyAccount.dto"), exports);
 __exportStar(require("./familyAccount.dto"), exports);
+__exportStar(require("./familyWithMembers.dto"), exports);
 __exportStar(require("./getFamilies.dto"), exports);
 __exportStar(require("./index"), exports);
 __exportStar(require("./removeFamilyMember.dto"), exports);

package/dist/types/familyAccount/dto/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/familyAccount/dto/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,4DAA0C;AAC1C,4DAA0C;AAC1C,wDAAsC;AACtC,2DAAyC;AACzC,wDAAsC;AACtC,4DAA0C;AAC1C,sDAAoC;AACpC,oDAAkC;AAClC,0CAAwB;AACxB,2DAAyC;AACzC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/familyAccount/dto/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,4DAA0C;AAC1C,4DAA0C;AAC1C,wDAAsC;AACtC,2DAAyC;AACzC,wDAAsC;AACtC,4DAA0C;AAC1C,sDAAoC;AACpC,0DAAwC;AACxC,oDAAkC;AAClC,0CAAwB;AACxB,2DAAyC;AACzC,4DAA0C"}

package/dist/types/familyAccount/enums.d.ts

@@ -0,0 +1,4 @@
+export declare enum FamilyAccountExpandsEnum {
+    MEMBERS = "members",
+    MEMBERS_PROFILE_PIC = "members.profilePicture"
+}

package/dist/types/familyAccount/enums.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FamilyAccountExpandsEnum = void 0;
+var FamilyAccountExpandsEnum;
+(function (FamilyAccountExpandsEnum) {
+    FamilyAccountExpandsEnum["MEMBERS"] = "members";
+    FamilyAccountExpandsEnum["MEMBERS_PROFILE_PIC"] = "members.profilePicture";
+})(FamilyAccountExpandsEnum = exports.FamilyAccountExpandsEnum || (exports.FamilyAccountExpandsEnum = {}));
+//# sourceMappingURL=enums.js.map

package/dist/types/familyAccount/enums.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../src/types/familyAccount/enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IACnC,+CAAmB,CAAA;IACnB,0EAA8C,CAAA;AAC/C,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}

package/dist/types/familyAccount/index.d.ts

@@ -1 +1,2 @@
 export * from './dto';
+export * from './enums';

package/dist/types/familyAccount/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dto"), exports);
+__exportStar(require("./enums"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/familyAccount/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/familyAccount/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/familyAccount/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,0CAAwB"}

package/dist/types/folders/entities/folder-content.entity.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { BondBaseEntity } from '../../entity/BondBaseEntity';
 import { Folder } from './folder.entity';
 export declare enum ContentType {
@@ -16,4 +17,6 @@ export declare class FolderContent extends BondBaseEntity {
     folderId: number;
     metadata?: Record<string, unknown>;
     deletedAt: Date;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/folders/entities/folder-content.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder-content.entity.js","sourceRoot":"","sources":["../../../../src/types/folders/entities/folder-content.entity.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAI7D,IAAY,WAQX;AARD,WAAY,WAAW;IACtB,kDAAW,CAAA;IACX,8CAAS,CAAA;IACT,0EAAuB,CAAA;IACvB,gDAAU,CAAA;IACV,kEAAmB,CAAA;IACnB,oEAAoB,CAAA;IACpB,8EAAyB,CAAA;AAC1B,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAED,MAAa,aAAc,SAAQ,+BAAc;CAYhD;AAZD,sCAYC"}
+{"version":3,"file":"folder-content.entity.js","sourceRoot":"","sources":["../../../../src/types/folders/entities/folder-content.entity.ts"],"names":[],"mappings":";;;AAGA,gEAA6D;AAI7D,IAAY,WAQX;AARD,WAAY,WAAW;IACtB,kDAAW,CAAA;IACX,8CAAS,CAAA;IACT,0EAAuB,CAAA;IACvB,gDAAU,CAAA;IACV,kEAAmB,CAAA;IACnB,oEAAoB,CAAA;IACpB,8EAAyB,CAAA;AAC1B,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAED,MAAa,aAAc,SAAQ,+BAAc;CAgBhD;AAhBD,sCAgBC"}

package/dist/types/invoice/types/interfaces/invoice.interfaces.d.ts

@@ -81,3 +81,10 @@ export interface IInvoiceOverdueFields {
     paidAmount: number;
     price: number;
 }
+export interface IReassignInvoicesAndRelatedRecordsResult {
+    invoices: number;
+    lineItems: number;
+    payments: number;
+    futureInstallments: number;
+    productsUsers: number;
+}

package/dist/types/membership/entities/membership-member-renewal.entity.d.ts

@@ -1,4 +1,5 @@
 import { TimeUnit } from '@bondsports/date-time';
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { ProductsUsers } from '../../entity/ProductsUsers';
 import { UserPaymentMethod } from '../../entity/user-payment-method';
@@ -35,4 +36,6 @@ export declare class MembershipMemberRenewal extends OrganizationConnectionBaseE
     /**
      */
     paymentMethodId?: string;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/membership/entities/membership-member-renewal.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"membership-member-renewal.entity.js","sourceRoot":"","sources":["../../../../src/types/membership/entities/membership-member-renewal.entity.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AASjG,MAAa,uBAAwB,SAAQ,mEAAgC;CAuD5E;AAvDD,0DAuDC"}
+{"version":3,"file":"membership-member-renewal.entity.js","sourceRoot":"","sources":["../../../../src/types/membership/entities/membership-member-renewal.entity.ts"],"names":[],"mappings":";;;AAIA,oGAAiG;AASjG,MAAa,uBAAwB,SAAQ,mEAAgC;CA2D5E;AA3DD,0DA2DC"}

package/dist/types/membership/entities/membership-member.entity.d.ts

@@ -1,4 +1,5 @@
 import { TimeUnit } from '@bondsports/date-time';
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { Customer } from '../../entity/Customer';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { ProductsUsers } from '../../entity/ProductsUsers';
@@ -49,4 +50,6 @@ export declare class MembershipMember extends OrganizationConnectionBaseEntity {
     /**
      */
     nextPaymentMethodId?: string;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/membership/entities/membership-member.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"membership-member.entity.js","sourceRoot":"","sources":["../../../../src/types/membership/entities/membership-member.entity.ts"],"names":[],"mappings":";;;AAcA,oGAAiG;AAUjG,MAAa,gBAAiB,SAAQ,mEAAgC;CA4ErE;AA5ED,4CA4EC"}
+{"version":3,"file":"membership-member.entity.js","sourceRoot":"","sources":["../../../../src/types/membership/entities/membership-member.entity.ts"],"names":[],"mappings":";;;AAeA,oGAAiG;AAUjG,MAAa,gBAAiB,SAAQ,mEAAgC;CAgFrE;AAhFD,4CAgFC"}

package/dist/types/notes/entities/Note.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { ResourceNameTypeEnum } from '../../services/enums.service';
 export declare class Note extends OrganizationConnectionBaseEntity {
@@ -12,4 +13,6 @@ export declare class Note extends OrganizationConnectionBaseEntity {
     isPublic: boolean;
     deletedAt?: Date;
     parentNoteId?: number;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/notes/entities/Note.js.map

@@ -1 +1 @@
-{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../../src/types/notes/entities/Note.ts"],"names":[],"mappings":";;;AAEA,oGAAiG;AAIjG,MAAa,IAAK,SAAQ,mEAAgC;CAsBzD;AAtBD,oBAsBC"}
+{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../../src/types/notes/entities/Note.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAIjG,MAAa,IAAK,SAAQ,mEAAgC;CA0BzD;AA1BD,oBA0BC"}

package/dist/types/payment/entities/FutureInstallment.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { Invoice } from '../../entity/Invoice';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { UserPaymentMethod } from '../../entity/user-payment-method';
@@ -29,4 +30,6 @@ export declare class FutureInstallment extends OrganizationConnectionBaseEntity
     lastPaymentFailure?: PaymentFailure;
     fee?: Fee;
     feeAmount?: number;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/payment/entities/FutureInstallment.js.map

@@ -1 +1 @@
-{"version":3,"file":"FutureInstallment.js","sourceRoot":"","sources":["../../../../src/types/payment/entities/FutureInstallment.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAOjG,MAAa,iBAAkB,SAAQ,mEAAgC;CA8CtE;AA9CD,8CA8CC"}
+{"version":3,"file":"FutureInstallment.js","sourceRoot":"","sources":["../../../../src/types/payment/entities/FutureInstallment.ts"],"names":[],"mappings":";;;AAIA,oGAAiG;AAOjG,MAAa,iBAAkB,SAAQ,mEAAgC;CAkDtE;AAlDD,8CAkDC"}

package/dist/types/payment/entities/Payment.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { Invoice } from '../../entity/Invoice';
 import { InvoiceToPayment } from '../../entity/InvoiceToPayment';
 import { LineItemHistory } from '../../entity/LineItemHistory';
@@ -50,4 +51,6 @@ export declare class Payment extends OrganizationConnectionBaseEntity {
     installments?: FutureInstallment[];
     totalFeesAmount?: number;
     lineItems: LineItems[];
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/payment/entities/Payment.js.map

@@ -1 +1 @@
-{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../../src/types/payment/entities/Payment.ts"],"names":[],"mappings":";;;AAMA,oGAAiG;AAajG,MAAa,OAAQ,SAAQ,mEAAgC;CAyE5D;AAzED,0BAyEC"}
+{"version":3,"file":"Payment.js","sourceRoot":"","sources":["../../../../src/types/payment/entities/Payment.ts"],"names":[],"mappings":";;;AAOA,oGAAiG;AAajG,MAAa,OAAQ,SAAQ,mEAAgC;CA6E5D;AA7ED,0BA6EC"}

package/dist/types/payment/types/enums/payment.enums.d.ts

@@ -14,6 +14,7 @@ export declare enum PaymentFilterByEnum {
     PAYMENT_STATUS = "paymentStatus",
     STATUS = "status",
     ID = "id",
+    INVOICE_ID = "invoiceId",
     CREATED_AT = "createdAt",
     PRICE = "price",
     DUE_DATE = "dueDate"

package/dist/types/payment/types/enums/payment.enums.js

@@ -19,6 +19,7 @@ var PaymentFilterByEnum;
     PaymentFilterByEnum["PAYMENT_STATUS"] = "paymentStatus";
     PaymentFilterByEnum["STATUS"] = "status";
     PaymentFilterByEnum["ID"] = "id";
+    PaymentFilterByEnum["INVOICE_ID"] = "invoiceId";
     PaymentFilterByEnum["CREATED_AT"] = "createdAt";
     PaymentFilterByEnum["PRICE"] = "price";
     PaymentFilterByEnum["DUE_DATE"] = "dueDate";

package/dist/types/payment/types/enums/payment.enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment.enums.js","sourceRoot":"","sources":["../../../../../src/types/payment/types/enums/payment.enums.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"payment.enums.js","sourceRoot":"","sources":["../../../../../src/types/payment/types/enums/payment.enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAWX;AAXD,WAAY,iBAAiB;IAC5B,0CAAqB,CAAA;IACrB,gDAA2B,CAAA;IAC3B,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;IACb,0CAAqB,CAAA;IACrB,wDAAmC,CAAA;IACnC,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;AACxC,CAAC,EAXW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAW5B;AAED,IAAY,mBAQX;AARD,WAAY,mBAAmB;IAC9B,uDAAgC,CAAA;IAChC,wCAAiB,CAAA;IACjB,gCAAS,CAAA;IACT,+CAAwB,CAAA;IACxB,+CAAwB,CAAA;IACxB,sCAAe,CAAA;IACf,2CAAoB,CAAA;AACrB,CAAC,EARW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAQ9B;AAED,IAAY,cAKX;AALD,WAAY,cAAc;IACzB,mCAAiB,CAAA;IACjB,uCAAqB,CAAA;IACrB,2CAAyB,CAAA;IACzB,uDAAqC,CAAA;AACtC,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAED,IAAY,mBASX;AATD,WAAY,mBAAmB;IAC9B,iFAAkB,CAAA;IAClB,qFAAoB,CAAA;IACpB,qEAAY,CAAA;IACZ,qEAAY,CAAA;IACZ,uEAAa,CAAA;IACb,+DAAS,CAAA;IACT,6EAAgB,CAAA;IAChB,mEAAW,CAAA;AACZ,CAAC,EATW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAS9B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC7B,+DAAU,CAAA;IACV,2DAAQ,CAAA;AACT,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,qBAeX;AAfD,WAAY,qBAAqB;IAChC,sCAAa,CAAA;IACb,gDAAuB,CAAA;IACvB,sCAAa,CAAA;IACb,wCAAe,CAAA;IACf,4CAAmB,CAAA;IACnB,8DAAqC,CAAA;IACrC,gDAAuB,CAAA;IACvB,wCAAe,CAAA;IACf,8CAAqB,CAAA;IACrB,gDAAuB,CAAA;IACvB,sCAAa,CAAA;IACb,8CAAqB,CAAA;IACrB,4DAAmC,CAAA;IACnC,4CAAmB,CAAA;AACpB,CAAC,EAfW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAehC;AAED,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC/B,yCAAiB,CAAA;IACjB,uCAAe,CAAA;AAChB,CAAC,EAHW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAG/B;AAED,IAAY,wBAKX;AALD,WAAY,wBAAwB;IACnC,6CAAiB,CAAA;IACjB,2CAAe,CAAA;IACf,+CAAmB,CAAA;IACnB,+CAAmB,CAAA;AACpB,CAAC,EALW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAKnC;AAED,IAAY,uBAQX;AARD,WAAY,uBAAuB;IAClC,4CAAiB,CAAA;IACjB,kDAAuB,CAAA;IACvB,4CAAiB,CAAA;IACjB,gDAAqB,CAAA;IACrB,8CAAmB,CAAA;IACnB,kEAAuC,CAAA;IACvC,gDAAqB,CAAA;AACtB,CAAC,EARW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAQlC;AAEY,QAAA,wCAAwC,GAAG;IACvD,uBAAuB,CAAC,MAAM;IAC9B,uBAAuB,CAAC,OAAO;IAC/B,uBAAuB,CAAC,SAAS;CACjC,CAAC;AAEW,QAAA,6BAA6B,GAAG;IAC5C,uBAAuB,CAAC,MAAM;IAC9B,uBAAuB,CAAC,MAAM;IAC9B,uBAAuB,CAAC,iBAAiB;IACzC,uBAAuB,CAAC,QAAQ;CAChC,CAAC;AAEF;;;;GAIG;AACU,QAAA,yBAAyB,GAAG,CAAC,uBAAuB,CAAC,MAAM,EAAE,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AAErH;;GAEG;AACH;;;GAGG;AACU,QAAA,yBAAyB,GAAG;IACxC,uBAAuB,CAAC,MAAM;IAC9B,uBAAuB,CAAC,iBAAiB;IACzC,uBAAuB,CAAC,QAAQ;CAChC,CAAC;AAEF,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC7B,2CAAqB,CAAA;IACrB,8CAAwB,CAAA;AACzB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC3B,iCAAa,CAAA;IACb,6CAAyB,CAAA;IACzB,uCAAmB,CAAA;AACpB,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B;AAED,IAAY,eAGX;AAHD,WAAY,eAAe;IAC1B,gDAA6B,CAAA;IAC7B,oCAAiB,CAAA;AAClB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B"}

package/dist/types/punch-pass/entities/user-punch-pass.entity.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { LineItems } from '../../entity/LineItems';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { ProductsUsers } from '../../entity/ProductsUsers';
@@ -23,4 +24,6 @@ export declare class UserPunchPass extends OrganizationConnectionBaseEntity {
     user?: User;
     redemptions?: UserRedemption[];
     totalRedeemed?: number;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/punch-pass/entities/user-punch-pass.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-punch-pass.entity.js","sourceRoot":"","sources":["../../../../src/types/punch-pass/entities/user-punch-pass.entity.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAQjG,MAAa,aAAc,SAAQ,mEAAgC;CAkClE;AAlCD,sCAkCC"}
+{"version":3,"file":"user-punch-pass.entity.js","sourceRoot":"","sources":["../../../../src/types/punch-pass/entities/user-punch-pass.entity.ts"],"names":[],"mappings":";;;AAIA,oGAAiG;AAQjG,MAAa,aAAc,SAAQ,mEAAgC;CAsClE;AAtCD,sCAsCC"}

package/dist/types/questionnaires/entities/Answer.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { ResourceNameTypeEnum } from '../../services/enums.service';
 import { AnswerTitle } from './AnswerTitle';
@@ -14,4 +15,6 @@ export declare class Answer extends OrganizationConnectionBaseEntity {
     answerTitle: AnswerTitle;
     metaData: any | null;
     questionText: string | null;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/questionnaires/entities/Answer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Answer.js","sourceRoot":"","sources":["../../../../src/types/questionnaires/entities/Answer.ts"],"names":[],"mappings":";;;AAEA,oGAAiG;AAMjG,MAAa,MAAO,SAAQ,mEAAgC;CAsB3D;AAtBD,wBAsBC"}
+{"version":3,"file":"Answer.js","sourceRoot":"","sources":["../../../../src/types/questionnaires/entities/Answer.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAMjG,MAAa,MAAO,SAAQ,mEAAgC;CA0B3D;AA1BD,wBA0BC"}

package/dist/types/questionnaires/entities/AnswerTitle.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { Media } from '../../media/entities/Media';
 import { Answer } from './Answer';
@@ -9,4 +10,6 @@ export declare class AnswerTitle extends OrganizationConnectionBaseEntity {
     questionnaire: Questionnaires;
     mediaId?: number;
     media: Media;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/questionnaires/entities/AnswerTitle.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnswerTitle.js","sourceRoot":"","sources":["../../../../src/types/questionnaires/entities/AnswerTitle.ts"],"names":[],"mappings":";;;AAEA,oGAAiG;AAMjG,MAAa,WAAY,SAAQ,mEAAgC;CAYhE;AAZD,kCAYC"}
+{"version":3,"file":"AnswerTitle.js","sourceRoot":"","sources":["../../../../src/types/questionnaires/entities/AnswerTitle.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAMjG,MAAa,WAAY,SAAQ,mEAAgC;CAgBhE;AAhBD,kCAgBC"}

package/dist/types/reservations/dto/reservation.dto.d.ts

@@ -167,6 +167,7 @@ export declare class FindSlotsQueryParamsDto extends PaginationSearchQuery<SlotO
     productsIds?: number[];
     segmentsIds?: number[];
     notes?: SlotNotesFilterEnum[];
+    orderBy?: SlotOrderBy;
 }
 export declare class CategoryPricesDto {
     slot: number;

package/dist/types/reservations/dto/reservation.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservation.dto.js","sourceRoot":"","sources":["../../../../src/types/reservations/dto/reservation.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reservation.dto.js","sourceRoot":"","sources":["../../../../src/types/reservations/dto/reservation.dto.ts"],"names":[],"mappings":"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"}

package/dist/types/reservations/entities/reservation.entity.d.ts

@@ -1,4 +1,5 @@
 import { SportsEnum } from '../../activities/types/activities.enums';
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { Customer } from '../../entity/Customer';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { Resource } from '../../resources/entities/Resource';
@@ -41,4 +42,6 @@ export declare class Reservation extends OrganizationConnectionBaseEntity {
     sportType?: SportsEnum;
     migrationStatus?: string;
     invoicesIds?: number[];
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/reservations/entities/reservation.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservation.entity.js","sourceRoot":"","sources":["../../../../src/types/reservations/entities/reservation.entity.ts"],"names":[],"mappings":";;;AAIA,oGAAiG;AAiBjG,MAAa,WAAY,SAAQ,mEAAgC;CAqEhE;AArED,kCAqEC"}
+{"version":3,"file":"reservation.entity.js","sourceRoot":"","sources":["../../../../src/types/reservations/entities/reservation.entity.ts"],"names":[],"mappings":";;;AAKA,oGAAiG;AAiBjG,MAAa,WAAY,SAAQ,mEAAgC;CAyEhE;AAzED,kCAyEC"}

package/dist/types/user/entities/User.d.ts

@@ -1,4 +1,5 @@
 import { Address } from '../../address/entities/Address';
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { BondBaseEntity } from '../../entity/BondBaseEntity';
 import { Customer } from '../../entity/Customer';
 import { EventAttendee } from '../../entity/EventAttendees';
@@ -55,6 +56,8 @@ export declare class User extends BondBaseEntity {
     customers: Customer[];
     resources?: Resource[];
     organizationUsers?: OrganizationUsers[];
+    mergeId?: number;
+    merge?: CustomerMerge;
 }
 export declare class IUserInOrganization extends User {
     organizationId: number;

package/dist/types/user/entities/User.js.map

@@ -1 +1 @@
-{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/types/user/entities/User.ts"],"names":[],"mappings":";;;AAGA,gEAA6D;AAgB7D,MAAa,IAAK,SAAQ,+BAAc;CAkFvC;AAlFD,oBAkFC;AAED,MAAa,mBAAoB,SAAQ,IAAI;CAI5C;AAJD,kDAIC"}
+{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/types/user/entities/User.ts"],"names":[],"mappings":";;;AAIA,gEAA6D;AAgB7D,MAAa,IAAK,SAAQ,+BAAc;CAsFvC;AAtFD,oBAsFC;AAED,MAAa,mBAAoB,SAAQ,IAAI;CAI5C;AAJD,kDAIC"}

package/dist/types/user/types/family.interfaces.d.ts

@@ -0,0 +1,5 @@
+export interface IFetchFamilyAccountsOptions {
+    organizationId?: number;
+    relations?: string[];
+    throwError?: boolean;
+}

package/dist/types/user/types/family.interfaces.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=family.interfaces.js.map

package/dist/types/user/types/family.interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"family.interfaces.js","sourceRoot":"","sources":["../../../../src/types/user/types/family.interfaces.ts"],"names":[],"mappings":""}

package/dist/types/user/types/index.d.ts

@@ -1 +1,2 @@
+export * from './family.interfaces';
 export * from './user.interfaces';

package/dist/types/user/types/index.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./family.interfaces"), exports);
 __exportStar(require("./user.interfaces"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/user/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/user/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/user/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,oDAAkC"}

package/dist/types/user-identification/entities/UserIdentifier.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { BondBaseEntity } from '../../entity/BondBaseEntity';
 import { Customer } from '../../entity/Customer';
 import { Facility } from '../../entity/Facility';
@@ -18,4 +19,6 @@ export declare class UserIdentifier extends BondBaseEntity {
     validUntil?: Date;
     appleWalletPassGenerationCount: number;
     googleWalletPassGenerationCount: number;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/user-identification/entities/UserIdentifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserIdentifier.js","sourceRoot":"","sources":["../../../../src/types/user-identification/entities/UserIdentifier.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAM7D,MAAa,cAAe,SAAQ,+BAAc;CA6BjD;AA7BD,wCA6BC"}
+{"version":3,"file":"UserIdentifier.js","sourceRoot":"","sources":["../../../../src/types/user-identification/entities/UserIdentifier.ts"],"names":[],"mappings":";;;AAGA,gEAA6D;AAM7D,MAAa,cAAe,SAAQ,+BAAc;CAiCjD;AAjCD,wCAiCC"}

package/dist/types/waitlist/dto/waitlist.dto.d.ts

@@ -35,6 +35,7 @@ export declare class GetWaitlistEntryQueryDto extends ByParentIdAndTypeDto {
 export declare class GetWaitlistEntriesQueryDto extends PaginationSearchQuery<WaitlistEntryOrderBy> implements IQueryWaitlistFilters {
     [WaitlistFilterParamsEnum.PRODUCT_IDS]?: number[];
     [WaitlistFilterParamsEnum.RESOURCES]?: IWaitlistResourcesFilter;
+    orderBy?: WaitlistEntryOrderBy;
 }
 export declare class MassActionWaitlistEntriesDto extends MassActionFilterDto implements IQueryWaitlistFilters {
     [WaitlistFilterParamsEnum.PRODUCT_IDS]?: number[];

package/dist/types/waitlist/dto/waitlist.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitlist.dto.js","sourceRoot":"","sources":["../../../../src/types/waitlist/dto/waitlist.dto.ts"],"names":[],"mappings":";;;AAGA,uDAAqG;AACrG,8EAAyG;AAGzG,4DAKiC;AAGjC,MAAa,sBAAsB;CAMlC;AAND,wDAMC;AAED,MAAa,gBAAiB,SAAQ,4CAAyB;CAY9D;AAZD,4CAYC;AAED,MAAa,gBAAiB,SAAQ,4CAAyB;CAQ9D;AARD,4CAQC;AAED,MAAa,oBAAqB,SAAQ,sCAAmB;CAI5D;AAJD,oDAIC;AAED,MAAa,wBAAyB,SAAQ,oBAAoB;CAEjE;AAFD,4DAEC;AAED,MAAa,0BACZ,SAAQ,mCAA2C;CAKnD;AAND,gEAMC;AAHC,yCAAwB,CAAC,WAAW,EAEpC,yCAAwB,CAAC,SAAS;AAGpC,MAAa,4BAA6B,SAAQ,iCAAmB;CAIpE;AAJD,oEAIC;AAHC,yCAAwB,CAAC,WAAW,EAEpC,yCAAwB,CAAC,SAAS;AAGpC,MAAa,gBAAgB;CAU5B;AAVD,4CAUC;AAED,MAAa,mBAAoB,SAAQ,4CAAyB;CAYjE;AAZD,kDAYC;AAED,MAAa,mBAAoB,SAAQ,4CAAyB;CAYjE;AAZD,kDAYC;AAED,MAAa,uBAAwB,SAAQ,mBAAmB;CAE/D;AAFD,0DAEC;AAED,MAAa,mBAAoB,SAAQ,8BAAgB;CAIxD;AAJD,kDAIC;AAED,MAAa,yBAAyB;CAIrC;AAJD,8DAIC;AAHC,0CAAyB,CAAC,YAAY,EAEtC,0CAAyB,CAAC,aAAa"}
+{"version":3,"file":"waitlist.dto.js","sourceRoot":"","sources":["../../../../src/types/waitlist/dto/waitlist.dto.ts"],"names":[],"mappings":";;;AAGA,uDAAqG;AACrG,8EAAyG;AAGzG,4DAKiC;AAGjC,MAAa,sBAAsB;CAMlC;AAND,wDAMC;AAED,MAAa,gBAAiB,SAAQ,4CAAyB;CAY9D;AAZD,4CAYC;AAED,MAAa,gBAAiB,SAAQ,4CAAyB;CAQ9D;AARD,4CAQC;AAED,MAAa,oBAAqB,SAAQ,sCAAmB;CAI5D;AAJD,oDAIC;AAED,MAAa,wBAAyB,SAAQ,oBAAoB;CAEjE;AAFD,4DAEC;AAED,MAAa,0BACZ,SAAQ,mCAA2C;CAOnD;AARD,gEAQC;AALC,yCAAwB,CAAC,WAAW,EAEpC,yCAAwB,CAAC,SAAS;AAKpC,MAAa,4BAA6B,SAAQ,iCAAmB;CAIpE;AAJD,oEAIC;AAHC,yCAAwB,CAAC,WAAW,EAEpC,yCAAwB,CAAC,SAAS;AAGpC,MAAa,gBAAgB;CAU5B;AAVD,4CAUC;AAED,MAAa,mBAAoB,SAAQ,4CAAyB;CAYjE;AAZD,kDAYC;AAED,MAAa,mBAAoB,SAAQ,4CAAyB;CAYjE;AAZD,kDAYC;AAED,MAAa,uBAAwB,SAAQ,mBAAmB;CAE/D;AAFD,0DAEC;AAED,MAAa,mBAAoB,SAAQ,8BAAgB;CAIxD;AAJD,kDAIC;AAED,MAAa,yBAAyB;CAIrC;AAJD,8DAIC;AAHC,0CAAyB,CAAC,YAAY,EAEtC,0CAAyB,CAAC,aAAa"}

package/dist/types/waitlist/entities/waitlistEntry.entity.d.ts

@@ -1,5 +1,6 @@
 import { CartItem } from '../../cart/entities/cart-item.entity';
 import { Cart } from '../../cart/entities/cart.entity';
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { Customer } from '../../entity/Customer';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { Product } from '../../product-pricing/entities/product.entity';
@@ -21,4 +22,6 @@ export declare class WaitlistEntry extends OrganizationConnectionBaseEntity {
     product?: Product;
     addons?: CartItem[];
     status?: AvailabilityStatusEnum;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/waitlist/entities/waitlistEntry.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitlistEntry.entity.js","sourceRoot":"","sources":["../../../../src/types/waitlist/entities/waitlistEntry.entity.ts"],"names":[],"mappings":";;;AAKA,oGAAiG;AAQjG,MAAa,aAAc,SAAQ,mEAAgC;CA2BlE;AA3BD,sCA2BC"}
+{"version":3,"file":"waitlistEntry.entity.js","sourceRoot":"","sources":["../../../../src/types/waitlist/entities/waitlistEntry.entity.ts"],"names":[],"mappings":";;;AAMA,oGAAiG;AAQjG,MAAa,aAAc,SAAQ,mEAAgC;CA+BlE;AA/BD,sCA+BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bondsports/types",
-	"version": "2.3.68",
+	"version": "2.3.70-a-1",
 	"description": "backend types module for Bond-Sports",
 	"main": "./dist/index.js",
 	"scripts": {
@@ -33,12 +33,12 @@
 	],
 	"homepage": "https://github.com/Bond-Sports/bondUtils/tree/main/packages/types#readme",
 	"dependencies": {
+		"@bondsports/date-time": "^2.4.48",
+		"@bondsports/notifications-sdk": "latest",
 		"moment": "^2.29.1",
 		"rimraf": "^3.0.2",
 		"stripe": "9.1.0",
-		"typeorm": "^0.2.32",
-		"@bondsports/date-time": "^2.4.48",
-		"@bondsports/notifications-sdk": "latest"
+		"typeorm": "^0.2.32"
 	},
 	"devDependencies": {
 		"@bondsports/eslint-config": "^1.0.2",
@@ -50,5 +50,5 @@
 		"ts-node": "^10.8.0",
 		"typescript": "^4.4.3"
 	},
-	"gitHead": "178ca9dc5ea5e94b44d765b6663e7a4ad0d19d98"
+	"gitHead": "7c585269c2cec6d5f4d68744a478251b1b4cff55"
 }