turf-common 1.0.16-beta.22 → 1.0.16-beta.24

package/build/models/turf-model.d.ts

@@ -4,8 +4,8 @@ import { ITurfModel } from "../interface/turf-model.interface";
 import { IOrganizationEntity, IOrganizationRel } from "../types/entity/organization-entity.type";
 import { IPitchEntity } from "../types/entity/pitch-entity.type";
 import { ISubscriptionPitchMappingEntity } from "../types/entity/subscription-pitch-mapping.type";
-import { ITurfEntity } from "../types/entity/turf-entity.type";
-import { IUserEntity } from "../types/entity/user-entity.type";
+import { ITurfEntity, ITurfEntityRel } from "../types/entity/turf-entity.type";
+import { IUserEntityRel } from "../types/entity/user-entity.type";
 export declare class TurfModel implements ITurfModel {
     id: number;
     turfName: string;
@@ -19,7 +19,7 @@ export declare class TurfModel implements ITurfModel {
     updatedBy: number;
     pitches: IPitchEntity[];
     organization: IOrganizationEntity & IOrganizationRel;
-    Users: IUserEntity[];
+    Users: IUserEntityRel[];
     constructor(data: ITurfEntity);
     getPitchStatusCount(): IPitchStatus;
     getModifiedTurfEntity(): ITurf;
@@ -30,5 +30,5 @@ export declare class TurfModel implements ITurfModel {
         [key: number]: ITurfEntity;
     };
     static fromEntity(data: ITurfEntity): ITurfModel;
-    static filterBySubscriptionPitchMapping(turfEntities: ITurfModel[], subscriptionPitchMappingEntities: ISubscriptionPitchMappingEntity[], pitchStatusSet: Set<string>): ITurfModel[];
+    static filterBySubscriptionPitchMapping(turfEntities: ITurfEntityRel[], subscriptionPitchMappingEntities: ISubscriptionPitchMappingEntity[], pitchStatusSet: Set<string>): ITurfEntityRel[];
 }

package/build/models/user-model.d.ts

@@ -1,7 +1,7 @@
 import { UserStatus } from "../enums/user-status.enum";
 import { UserType } from "../enums/valid-type.enum";
 import { IUserModel } from "../interface/user-model.interface";
-import { ITurfEntity } from "../types/entity/turf-entity.type";
+import { ITurfEntityRel } from "../types/entity/turf-entity.type";
 import { IUserEntity } from "../types/entity/user-entity.type";
 export declare class UserModel implements IUserModel {
     id: number;
@@ -23,7 +23,7 @@ export declare class UserModel implements IUserModel {
     updatedBy: number;
     registrationId: number;
     comments: string;
-    turf: ITurfEntity[];
+    turf: ITurfEntityRel[];
     constructor(data: IUserModel);
     static toMap(userEntities: IUserEntity[]): {
         [key: number]: IUserEntity;

package/build/types/entity/coupon.entity.type.d.ts

@@ -5,6 +5,6 @@ export type ICouponEntity = IEntityAuditColumn & {
     code: string;
     org_id: number;
 };
-export type ICouponRel = {
+export type ICouponEntityRel = ICouponEntity & {
     organization: IOrganizationEntity;
 };

package/build/types/entity/organization-entity.type.d.ts

@@ -1,7 +1,7 @@
 import { OrganizationStatus } from "../../enums/organization-status.enum";
-import { ITurfModel } from "../../interface/turf-model.interface";
-import { ICouponEntity } from "./coupon.entity.type";
+import { ICouponEntityRel } from "./coupon.entity.type";
 import { IEntityAuditColumn } from "./entity-audit-column.type";
+import { ITurfEntityRel } from "./turf-entity.type";
 export type IOrganizationEntity = IEntityAuditColumn & {
     id: number;
     name: string;
@@ -17,7 +17,7 @@ export type IOrganizationEntity = IEntityAuditColumn & {
     status: OrganizationStatus;
     registrationId: number;
 };
-export type IOrganizationRel = {
-    turfs: ITurfModel[];
-    coupon: ICouponEntity[];
+export type IOrganizationRel = IOrganizationEntity & {
+    turfs: ITurfEntityRel[];
+    coupon: ICouponEntityRel[];
 };

package/build/types/entity/pitch-entity.type.d.ts

@@ -1,7 +1,7 @@
 import { IEntityAuditColumn } from "./entity-audit-column.type";
-import { ITurfEntity } from "./turf-entity.type";
+import { ITurfEntityRel } from "./turf-entity.type";
 export type IPitchEntity = IEntityAuditColumn & {
-    turf: ITurfEntity;
+    turf: ITurfEntityRel;
     number: number;
     name: string;
     status: string;

package/build/types/entity/turf-entity.type.d.ts

@@ -1,7 +1,7 @@
 import { IEntityAuditColumn } from "./entity-audit-column.type";
-import { IOrganizationEntity } from "./organization-entity.type";
+import { IOrganizationRel as IOrganizationEntityRel } from "./organization-entity.type";
 import { IPitchEntity } from "./pitch-entity.type";
-import { IUserEntity } from "./user-entity.type";
+import { IUserEntityRel } from "./user-entity.type";
 export type ITurfEntity = IEntityAuditColumn & {
     id: number;
     turfName: string;
@@ -10,8 +10,8 @@ export type ITurfEntity = IEntityAuditColumn & {
     org_id: number;
     adhocRefund: boolean;
 };
-export type ITurfEntityRel = {
+export type ITurfEntityRel = ITurfEntity & {
     pitches: IPitchEntity[];
-    organization: IOrganizationEntity;
-    Users: IUserEntity[];
+    organization: IOrganizationEntityRel;
+    Users: IUserEntityRel[];
 };

package/build/types/entity/user-entity.type.d.ts

@@ -1,7 +1,7 @@
 import { IEntityAuditColumn } from "./entity-audit-column.type";
 import { UserStatus } from "../../enums/user-status.enum";
 import { UserType } from "../../enums/valid-type.enum";
-import { ITurfEntity } from "./turf-entity.type";
+import { ITurfEntityRel } from "./turf-entity.type";
 export interface IUserEntity extends IEntityAuditColumn {
     id: number;
     firstname: string;
@@ -19,6 +19,6 @@ export interface IUserEntity extends IEntityAuditColumn {
     registrationId: number;
     comments: string;
 }
-export interface IUserEntityRel {
-    turf: ITurfEntity[];
+export interface IUserEntityRel extends IUserEntity {
+    turf: ITurfEntityRel[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "turf-common",
-  "version": "1.0.16-beta.22",
+  "version": "1.0.16-beta.24",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",