@glissandoo/lib 1.94.1 → 1.95.0

package/functions/federationPartnership.d.ts

@@ -1,4 +1,4 @@
-import { BasicAddressData } from '../models/Partnership/Partner/types';
+import { BasicAddressData } from '../helpers/types';
 export declare namespace FederationPartnershipFbFunctionsTypes {
     interface AddParams {
         partnershipId: string;

package/functions/partner.d.ts

@@ -1,4 +1,5 @@
-import { BasicAddressData, PartnerData } from '../models/Partnership/Partner/types';
+import { PartnershipPartnerData } from '../models/Partnership/Partner/types';
+import { BasicAddressData } from '../helpers/types';
 import PartnerSubscription from '../models/Partnership/Subscription';
 import { PartnershipData } from '../models/Partnership/types';
 export declare namespace PartnerFbFunctionsTypes {
@@ -37,7 +38,7 @@ export declare namespace PartnerFbFunctionsTypes {
         token: string;
     }
     interface GetByTokenResult {
-        partner: Pick<PartnerData, 'name' | 'lastname' | 'email' | 'phone' | 'address'> & {
+        partner: Pick<PartnershipPartnerData, 'name' | 'lastname' | 'email' | 'phone' | 'address'> & {
             id: string;
             birthdate: number | null;
         };

package/functions/partnership.d.ts

@@ -1,4 +1,4 @@
-import { BasicAddressData } from '../models/Partnership/Partner/types';
+import { BasicAddressData } from '../helpers/types';
 export declare namespace PartnershipFbFunctionsTypes {
     interface PublishParams {
         groupId: string;

package/functions/partnershipPartner.d.ts

@@ -1,5 +1,5 @@
 import { CreatedOn } from '../helpers/types';
-import { BasicAddressData } from '../models/Partnership/Partner/types';
+import { BasicAddressData } from '../helpers/types';
 export declare namespace PartnershipPartnerFbFunctionsTypes {
     interface CreateParams {
         partnershipId: string;
@@ -10,26 +10,14 @@ export declare namespace PartnershipPartnerFbFunctionsTypes {
         phone: string | null;
         birthdate: number | null;
         address: BasicAddressData | null;
-        identificator: string;
         createdOn: CreatedOn;
     }
     type CreateResult = void;
-    interface EditParams {
-        partnershipId: string;
-    }
+    type EditParams = Omit<CreateParams, 'createdOn'>;
     type EditResult = void;
     interface RemoveParams {
         partnershipId: string;
+        partnerId: string;
     }
     type RemoveResult = void;
-    interface AddConfirmedAdminParams {
-        partnershipId: string;
-        userId: string;
-    }
-    type AddConfirmedAdminResult = void;
-    interface RemoveAdminParams {
-        partnershipId: string;
-        email: string;
-    }
-    type RemoveAdminResult = void;
 }

package/helpers/collections.d.ts

@@ -21,11 +21,11 @@ export declare enum CollectionNames {
     GroupStageTemplates = "stageTemplates",
     Metrics = "metrics",
     Partnership = "partnership",
-    PartnershipPartners = "partners",
-    PartnershipGroups = "groups",
-    PartnershipSubscriptions = "subscriptions",
-    PartnershipPayments = "payments",
-    PartnershipPlans = "plans",
+    PartnershipPartners = "partnershipPartner",
+    PartnershipGroups = "partnershipGroup",
+    PartnershipSubscriptions = "partnershipSubscription",
+    PartnershipPayments = "partnershipPayment",
+    PartnershipPlans = "partnershipPlan",
     Federation = "federation",
     FederationPartnerships = "partnerships",
     Offer = "offer",

package/helpers/collections.js

@@ -25,11 +25,11 @@ var CollectionNames;
     CollectionNames["GroupStageTemplates"] = "stageTemplates";
     CollectionNames["Metrics"] = "metrics";
     CollectionNames["Partnership"] = "partnership";
-    CollectionNames["PartnershipPartners"] = "partners";
-    CollectionNames["PartnershipGroups"] = "groups";
-    CollectionNames["PartnershipSubscriptions"] = "subscriptions";
-    CollectionNames["PartnershipPayments"] = "payments";
-    CollectionNames["PartnershipPlans"] = "plans";
+    CollectionNames["PartnershipPartners"] = "partnershipPartner";
+    CollectionNames["PartnershipGroups"] = "partnershipGroup";
+    CollectionNames["PartnershipSubscriptions"] = "partnershipSubscription";
+    CollectionNames["PartnershipPayments"] = "partnershipPayment";
+    CollectionNames["PartnershipPlans"] = "partnershipPlan";
     CollectionNames["Federation"] = "federation";
     CollectionNames["FederationPartnerships"] = "partnerships";
     CollectionNames["Offer"] = "offer";

package/helpers/types.d.ts

@@ -15,3 +15,10 @@ export declare enum CreatedOn {
     App = "app",
     Dashboard = "dashboard"
 }
+export interface BasicAddressData {
+    street?: string;
+    city?: string;
+    postalCode?: string;
+    province?: string;
+    country?: string;
+}

package/models/Customer/basic.d.ts

@@ -5,7 +5,7 @@ export default class CustomerBasic<D> extends Model<D & CustomerBasicData> {
     get basicInfo(): CustomerBasicData;
     get displayName(): string;
     get email(): string;
-    get address(): import("../Partnership/Partner/types").BasicAddressData;
+    get address(): import("../../helpers/types").BasicAddressData;
     get displayAddress(): string;
     get phone(): string | null;
     get groupIds(): string[];

package/models/Customer/types.d.ts

@@ -1,6 +1,6 @@
 import { DocumentReference, Timestamp } from '@google-cloud/firestore';
 import { AdminItem } from '../../helpers/types';
-import { BasicAddressData } from '../Partnership/Partner/types';
+import { BasicAddressData } from '../../helpers/types';
 export declare enum CustomerRoles {
     Admin = "admin"
 }

package/models/Federation/index.d.ts

@@ -13,7 +13,7 @@ export default class Federation extends Model<FederationData> {
     get photoURL(): string;
     get phone(): string | null;
     get web(): string | null;
-    get address(): import("../Partnership/Partner/types").BasicAddressData | null;
+    get address(): import("../../helpers/types").BasicAddressData | null;
     get displayAddress(): string;
     get partnershipConnectedIds(): string[];
     get createdAt(): FirebaseFirestore.Timestamp;

package/models/Federation/types.d.ts

@@ -1,6 +1,6 @@
 import { DocumentReference, Timestamp } from '@google-cloud/firestore';
 import { AdminItem } from '../../helpers/types';
-import { BasicAddressData } from '../Partnership/Partner/types';
+import { BasicAddressData } from '../../helpers/types';
 export interface FederationData {
     displayName: string;
     photoURL: string;

package/models/Partnership/Partner/basic.d.ts

@@ -1,11 +1,11 @@
 import { DocumentModel } from '../../Model';
-import PartnerTiny from './tiny';
-import { PartnerBasicData } from './types';
-export default class PartnerBasic<D> extends PartnerTiny<D & PartnerBasicData> {
+import PartnershipPartnerTiny from './tiny';
+import { PartnershipPartnerBasicData } from './types';
+export default class PartnershipPartnerBasic<D> extends PartnershipPartnerTiny<D & PartnershipPartnerBasicData> {
     constructor(doc: DocumentModel);
-    get basicInfo(): PartnerBasicData;
+    get basicInfo(): PartnershipPartnerBasicData;
     get createdAt(): FirebaseFirestore.Timestamp;
-    get createdBy(): string;
+    get createdBy(): import("../../../types/firestore").DocumentReference<import("../../../types/firestore").DocumentData>;
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get isDeleted(): boolean;

package/models/Partnership/Partner/basic.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const tiny_1 = __importDefault(require("./tiny"));
-class PartnerBasic extends tiny_1.default {
+class PartnershipPartnerBasic extends tiny_1.default {
     constructor(doc) {
         super(doc);
     }
@@ -36,4 +36,4 @@ class PartnerBasic extends tiny_1.default {
         return this.exists && !this.isDeleted;
     }
 }
-exports.default = PartnerBasic;
+exports.default = PartnershipPartnerBasic;

package/models/Partnership/Partner/index.d.ts

@@ -1,15 +1,19 @@
-import { DocumentModel } from '../../Model';
-import PartnerBasic from './basic';
-import { PartnerData } from './types';
-export default class Partner extends PartnerBasic<PartnerData> {
-    constructor(doc: DocumentModel);
-    get identificator(): string;
+import PartnershipPartnerBasic from './basic';
+import { PartnershipPartnerData } from './types';
+export default class PartnershipPartner extends PartnershipPartnerBasic<PartnershipPartnerData> {
     get name(): string;
     get lastname(): string;
     get email(): string;
     get phone(): string | null;
     get birthdate(): FirebaseFirestore.Timestamp | null;
     get partnershipId(): string;
-    get address(): import("./types").BasicAddressData | null;
+    get address(): import("../../../helpers/types").BasicAddressData | null;
+    get iban(): string | null;
     get displayAddress(): string | null;
+    get createdAt(): FirebaseFirestore.Timestamp;
+    get createdBy(): import("../../../types/firestore").DocumentReference<import("../../../types/firestore").DocumentData>;
+    get deletedAt(): FirebaseFirestore.Timestamp | null;
+    get deletedBy(): string | null;
+    get isDeleted(): boolean;
+    get isActive(): boolean;
 }

package/models/Partnership/Partner/index.js

@@ -4,14 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const isString_1 = __importDefault(require("lodash/isString"));
+const utils_1 = require("../../../helpers/utils");
 const basic_1 = __importDefault(require("./basic"));
-class Partner extends basic_1.default {
-    constructor(doc) {
-        super(doc);
-    }
-    get identificator() {
-        return this.data.identificator;
-    }
+class PartnershipPartner extends basic_1.default {
     get name() {
         return this.data.name;
     }
@@ -28,11 +23,14 @@ class Partner extends basic_1.default {
         return this.data.birthdate;
     }
     get partnershipId() {
-        return this.data.partnershipId;
+        return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
     get address() {
         return this.data.address;
     }
+    get iban() {
+        return this.data.iban;
+    }
     get displayAddress() {
         if (!this.address)
             return null;
@@ -40,5 +38,23 @@ class Partner extends basic_1.default {
         const fields = [street, postalCode, city, province, country];
         return fields.filter((field) => (0, isString_1.default)(field)).join(', ');
     }
+    get createdAt() {
+        return this.data.createdAt;
+    }
+    get createdBy() {
+        return this.data.createdBy;
+    }
+    get deletedAt() {
+        return this.data.deletedAt || null;
+    }
+    get deletedBy() {
+        return this.data.deletedBy || null;
+    }
+    get isDeleted() {
+        return this.deletedAt !== null;
+    }
+    get isActive() {
+        return this.exists && !this.isDeleted;
+    }
 }
-exports.default = Partner;
+exports.default = PartnershipPartner;

package/models/Partnership/Partner/tiny.d.ts

@@ -1,8 +1,7 @@
-import Model, { DocumentModel } from '../../Model';
-import { PartnerTinyData } from './types';
-export default class PartnerTiny<D> extends Model<D & PartnerTinyData> {
-    constructor(doc: DocumentModel);
-    get tinyInfo(): PartnerTinyData;
+import Model from '../../Model';
+import { PartnershipPartnerTinyData } from './types';
+export default class PartnershipPartnerTiny<D> extends Model<D & PartnershipPartnerTinyData> {
+    get tinyInfo(): PartnershipPartnerTinyData;
     get photoURL(): string | null;
     get displayName(): string;
 }

package/models/Partnership/Partner/tiny.js

@@ -4,10 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Model_1 = __importDefault(require("../../Model"));
-class PartnerTiny extends Model_1.default {
-    constructor(doc) {
-        super(doc);
-    }
+class PartnershipPartnerTiny extends Model_1.default {
     get tinyInfo() {
         return {
             displayName: this.displayName,
@@ -21,4 +18,4 @@ class PartnerTiny extends Model_1.default {
         return this.data.displayName;
     }
 }
-exports.default = PartnerTiny;
+exports.default = PartnershipPartnerTiny;

package/models/Partnership/Partner/types.d.ts

@@ -1,29 +1,23 @@
 import { Timestamp } from '@google-cloud/firestore';
-export interface BasicAddressData {
-    street?: string;
-    city?: string;
-    postalCode?: string;
-    province?: string;
-    country?: string;
-}
-export interface PartnerTinyData {
+import { BasicAddressData } from '../../../helpers/types';
+import { DocumentReference } from '../../../types/firestore';
+export interface PartnershipPartnerTinyData {
     photoURL: string | null;
     displayName: string;
 }
-export interface PartnerBasicData extends PartnerTinyData {
+export interface PartnershipPartnerBasicData extends PartnershipPartnerTinyData {
     readonly createdAt: Timestamp;
-    readonly createdBy: string;
+    readonly createdBy: DocumentReference;
     deletedAt: Timestamp | null;
     deletedBy: string | null;
 }
-export interface PartnerData extends PartnerBasicData {
-    identificator: string;
+export interface PartnershipPartnerData extends PartnershipPartnerBasicData {
     name: string;
     lastname: string;
     email: string;
     address: BasicAddressData | null;
     phone: string | null;
     birthdate: Timestamp | null;
+    iban: string | null;
     groupIds: string[];
-    readonly partnershipId: string;
 }

package/models/Partnership/Subscription/index.d.ts

@@ -3,7 +3,7 @@ import PartnershipPlanBasic from '../Plan/basic';
 import { SubscriptionData, SubscriptionStatus } from './types';
 export default class PartnerSubscription extends PartnershipPlanBasic<SubscriptionData> {
     constructor(doc: DocumentModel);
-    get planRef(): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData, FirebaseFirestore.DocumentData>;
+    get planId(): string;
     get partnerId(): string;
     get partnershipId(): string;
     get status(): SubscriptionStatus;

package/models/Partnership/Subscription/index.js

@@ -11,8 +11,8 @@ class PartnerSubscription extends basic_1.default {
     constructor(doc) {
         super(doc);
     }
-    get planRef() {
-        return this.data.planRef;
+    get planId() {
+        return this.data.planId;
     }
     get partnerId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 3) || '';

package/models/Partnership/Subscription/types.d.ts

@@ -15,7 +15,7 @@ export interface SubscriptionData extends PartnershipPlanBasicData {
     paymentDate: Timestamp;
     status: SubscriptionStatus;
     lastPayment: LastPaymentType | null;
-    readonly planRef: DocumentReference;
-    readonly createdBy: DocumentReference;
-    readonly createdAt: Timestamp;
+    planId: string;
+    createdBy: DocumentReference;
+    createdAt: Timestamp;
 }

package/models/Partnership/basic.d.ts

@@ -2,11 +2,11 @@ import Model, { DocumentModel } from '../Model';
 import { PartnershipBasicData } from './types';
 export default class PartnershipBasic<D> extends Model<D & PartnershipBasicData> {
     constructor(doc: DocumentModel);
-    get basicInfo(): PartnershipBasicData;
     get displayName(): string;
     get photoURL(): string;
     get email(): string;
-    get address(): import("./Partner/types").BasicAddressData;
+    get website(): string | null;
+    get address(): import("../../helpers/types").BasicAddressData;
     get displayAddress(): string;
     get phone(): string | null;
     get groupIds(): string[];

package/models/Partnership/basic.js

@@ -9,19 +9,6 @@ class PartnershipBasic extends Model_1.default {
     constructor(doc) {
         super(doc);
     }
-    get basicInfo() {
-        return {
-            displayName: this.displayName,
-            photoURL: this.photoURL,
-            email: this.email,
-            phone: this.phone,
-            address: this.address,
-            CIF: this.CIF,
-            groupIds: this.groupIds,
-            partnerCount: this.partnerCount,
-            memberCount: this.memberCount,
-        };
-    }
     get displayName() {
         return this.data.displayName;
     }
@@ -31,6 +18,9 @@ class PartnershipBasic extends Model_1.default {
     get email() {
         return this.data.email;
     }
+    get website() {
+        return this.data.website || null;
+    }
     get address() {
         return this.data.address || {};
     }

package/models/Partnership/types.d.ts

@@ -1,6 +1,6 @@
 import { DocumentReference, Timestamp } from '@google-cloud/firestore';
 import { AdminItem } from '../../helpers/types';
-import { BasicAddressData } from './Partner/types';
+import { BasicAddressData } from '../../helpers/types';
 export declare enum PartnershipRoles {
     Admin = "admin"
 }
@@ -12,6 +12,7 @@ export interface PartnershipBasicData {
     photoURL: string;
     email: string;
     phone: string | null;
+    website: string | null;
     address: BasicAddressData;
     CIF: string | null;
     groupIds: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.94.1",
+	"version": "1.95.0",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",