@glissandoo/lib 1.96.0 → 1.97.1

package/functions/partnership.d.ts

@@ -1,7 +1,7 @@
 import { BasicAddressData } from '../helpers/types';
 import { PartnershipSepaCreditorInfo } from '../models/Partnership/types';
 export declare namespace PartnershipFbFunctionsTypes {
-    interface BaseCreateParams {
+    interface CreateData {
         displayName: string;
         CIF: string;
         email: string;
@@ -9,36 +9,30 @@ export declare namespace PartnershipFbFunctionsTypes {
         address: BasicAddressData;
         sepaCreditorInfo: PartnershipSepaCreditorInfo | null;
     }
-    export interface PublishParams extends BaseCreateParams {
+    interface PublishParams extends CreateData {
         groupId: string;
     }
-    export type PublishResult = void;
-    export interface CreateParams extends BaseCreateParams {
+    type PublishResult = void;
+    interface CreateParams extends CreateData {
         partnershipId: string;
     }
-    export type CreateResult = void;
-    export interface EditParams extends Partial<BaseCreateParams> {
+    type CreateResult = void;
+    interface EditParams extends Partial<CreateData> {
         partnershipId: string;
-        displayName: string;
-        CIF: string;
-        email: string;
-        phone: string | null;
-        address: BasicAddressData;
     }
-    export type EditResult = void;
-    export interface RemoveParams {
+    type EditResult = void;
+    interface RemoveParams {
         partnershipId: string;
     }
-    export type RemoveResult = void;
-    export interface AddConfirmedAdminParams {
+    type RemoveResult = void;
+    interface AddConfirmedAdminParams {
         partnershipId: string;
         email: string;
     }
-    export type AddConfirmedAdminResult = void;
-    export interface RemoveAdminParams {
+    type AddConfirmedAdminResult = void;
+    interface RemoveAdminParams {
         partnershipId: string;
         email: string;
     }
-    export type RemoveAdminResult = void;
-    export {};
+    type RemoveAdminResult = void;
 }

package/functions/partnershipPartner.d.ts

@@ -1,9 +1,8 @@
 import { BasicAddressData, CreatedOn } from '../helpers/types';
 import { PartnershipPartnerSepaMandate } from '../models/Partnership/Partner/types';
+import { SetOptional } from 'type-fest';
 export declare namespace PartnershipPartnerFbFunctionsTypes {
-    interface CreateParams {
-        partnershipId: string;
-        partnerId: string;
+    interface BaseCreateData {
         NIF: string | null;
         name: string;
         lastname: string;
@@ -11,15 +10,29 @@ export declare namespace PartnershipPartnerFbFunctionsTypes {
         phone: string | null;
         birthdate: number | null;
         address: BasicAddressData | null;
+        userId: string;
+    }
+    export interface CreateData extends BaseCreateData {
+        sepaMandate: SetOptional<PartnershipPartnerSepaMandate, 'mandateId'> | null;
         createdOn: CreatedOn;
-        sepaMandate: Omit<PartnershipPartnerSepaMandate, 'mandateId'> | null;
     }
-    type CreateResult = void;
-    type EditParams = Omit<CreateParams, 'createdOn'>;
-    type EditResult = void;
-    interface RemoveParams {
+    export interface CreateParams extends CreateData {
+        partnershipId: string;
+        partnerId: string;
+    }
+    export type CreateResult = void;
+    export interface EditData extends Partial<BaseCreateData> {
+        sepaMandate: PartnershipPartnerSepaMandate | null;
+    }
+    export interface EditParams extends EditData {
+        partnershipId: string;
+        partnerId: string;
+    }
+    export type EditResult = void;
+    export interface RemoveParams {
         partnershipId: string;
         partnerId: string;
     }
-    type RemoveResult = void;
+    export type RemoveResult = void;
+    export {};
 }

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

@@ -1,6 +1,7 @@
 import ModelWithLang from '../../Model/lang';
 import { PartnershipPartnerData } from './types';
 export default class PartnershipPartner extends ModelWithLang<PartnershipPartnerData> {
+    get partnershipId(): string;
     get name(): string;
     get lastname(): string;
     get photoURL(): string | null;
@@ -9,7 +10,6 @@ export default class PartnershipPartner extends ModelWithLang<PartnershipPartner
     get email(): string;
     get phone(): string | null;
     get birthdate(): FirebaseFirestore.Timestamp | null;
-    get partnershipId(): string[];
     get sepaMandate(): {
         holderDisplayAddress: string;
         mandateId: string;

package/models/Partnership/Partner/index.js

@@ -3,10 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = require("lodash");
 const types_1 = require("../../../helpers/types");
+const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
 class PartnershipPartner extends lang_1.default {
+    get partnershipId() {
+        return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
+    }
     get name() {
         return this.data.name;
     }
@@ -31,9 +34,6 @@ class PartnershipPartner extends lang_1.default {
     get birthdate() {
         return this.data.birthdate;
     }
-    get partnershipId() {
-        return (0, lodash_1.at)(this.ref.path.split('/'), 1) || '';
-    }
     get sepaMandate() {
         if (!this.data.sepaMandate)
             return null;

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

@@ -19,6 +19,7 @@ export interface PartnershipPartnerData {
     birthdate: Timestamp | null;
     NIF: string | null;
     sepaMandate: PartnershipPartnerSepaMandate | null;
+    userId: string | null;
     groupIds: string[];
     createdAt: Timestamp;
     createdBy: DocumentReference;
@@ -26,5 +27,4 @@ export interface PartnershipPartnerData {
     editedBy: string | null;
     deletedAt: Timestamp | null;
     deletedBy: string | null;
-    userId: string | null;
 }

package/models/Partnership/index.d.ts

@@ -7,14 +7,23 @@ export default class Partnership extends PartnershipBasic<PartnershipData> {
     get adminList(): import("../../helpers/types").AdminItem[];
     adminListByStatus(status: AdminItemStatus): import("../../helpers/types").AdminItem[];
     isAdmin(userId: string): boolean;
+    get federationIds(): string[];
+    get groupIds(): string[];
+    get sepaCreditorInfo(): {
+        displayAddress: string;
+        creditorId: string;
+        legalName: string;
+        address: import("../../helpers/types").BasicAddressData;
+        iban: string;
+        swiftbic: string;
+    } | null;
+    get glissandooAdminUrl(): string;
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdBy(): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData, FirebaseFirestore.DocumentData>;
+    get editedAt(): FirebaseFirestore.Timestamp | null;
+    get editedBy(): string | null;
     get deletedAt(): FirebaseFirestore.Timestamp | null;
     get deletedBy(): string | null;
     get isDeleted(): boolean;
     get isActive(): boolean;
-    get federationIds(): string[];
-    get groupIds(): string[];
-    get sepaCreditorInfo(): import("./types").PartnershipSepaCreditorInfo | null;
-    get glissandooAdminUrl(): string;
 }

package/models/Partnership/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const collections_1 = require("../../helpers/collections");
 const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
+const types_1 = require("../../helpers/types");
 const basic_1 = __importDefault(require("./basic"));
 class Partnership extends basic_1.default {
     get description() {
@@ -22,12 +23,35 @@ class Partnership extends basic_1.default {
     isAdmin(userId) {
         return this.admins.includes(userId);
     }
+    get federationIds() {
+        return this.data.federationIds || [];
+    }
+    get groupIds() {
+        return this.data.groupIds || [];
+    }
+    get sepaCreditorInfo() {
+        if (!this.data.sepaCreditorInfo)
+            return null;
+        return {
+            ...this.data.sepaCreditorInfo,
+            displayAddress: (0, types_1.displayBasicAddress)(this.data.sepaCreditorInfo.address),
+        };
+    }
+    get glissandooAdminUrl() {
+        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Partnership, this.id);
+    }
     get createdAt() {
         return this.data.createdAt;
     }
     get createdBy() {
         return this.data.createdBy;
     }
+    get editedAt() {
+        return this.data.editedAt || null;
+    }
+    get editedBy() {
+        return this.data.editedBy || null;
+    }
     get deletedAt() {
         return this.data.deletedAt || null;
     }
@@ -40,17 +64,5 @@ class Partnership extends basic_1.default {
     get isActive() {
         return this.exists && !this.deletedAt;
     }
-    get federationIds() {
-        return this.data.federationIds || [];
-    }
-    get groupIds() {
-        return this.data.groupIds || [];
-    }
-    get sepaCreditorInfo() {
-        return this.data.sepaCreditorInfo || null;
-    }
-    get glissandooAdminUrl() {
-        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.Partnership, this.id);
-    }
 }
 exports.default = Partnership;

package/models/Partnership/types.d.ts

@@ -9,7 +9,7 @@ export interface PartnershipAlgoliaData extends Pick<PartnershipData, 'displayNa
 export interface PartnershipSepaCreditorInfo {
     creditorId: string;
     legalName: string;
-    address: string;
+    address: BasicAddressData;
     iban: string;
     swiftbic: string;
 }
@@ -30,9 +30,11 @@ export interface PartnershipData extends PartnershipBasicData {
     description: string | null;
     administrators: string[];
     administratorsList: AdminItem[];
-    deletedAt: Timestamp | null;
-    deletedBy: string | null;
     federationIds: string[];
     createdAt: Timestamp;
     createdBy: DocumentReference;
+    editedAt: Timestamp | null;
+    editedBy: string | null;
+    deletedAt: Timestamp | null;
+    deletedBy: string | null;
 }

package/package.json

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