@glissandoo/lib 1.10.4 → 1.11.0

package/functions/federation.d.ts

@@ -1,4 +1,6 @@
 import { EventPromoterData } from '../models/Evento/types';
+import Federation from '../models/Federation';
+import FederationPartnership from '../models/Federation/Partnership';
 import { FederationData } from '../models/Federation/types';
 export declare namespace FederationFbFunctionsTypes {
     type CreateParams = Pick<FederationData, 'displayName' | 'photoURL' | 'email' | 'phone' | 'web' | 'address'> & {
@@ -42,4 +44,13 @@ export declare namespace FederationFbFunctionsTypes {
         federationId: string;
     }
     type ConfirmAdminResult = void;
+    interface GetConfederationParams {
+        federationIds: string[];
+    }
+    type ConfederationPartnershipType = Pick<FederationPartnership, 'id' | 'displayName' | 'email' | 'hasSchool' | 'leaderCount' | 'photoURL' | 'phone' | 'address' | 'CIF' | 'partnerCount' | 'memberCount' | 'connectedAt' | 'teacherCount' | 'studentCount' | 'updatedAt'>;
+    type FederationConfederationType = Pick<Federation, 'id' | 'displayName' | 'email' | 'photoURL' | 'phone' | 'web' | 'address' | 'partnershipIds'>;
+    interface GetConfederationResult {
+        federations: FederationConfederationType[];
+        partnerships: ConfederationPartnershipType[];
+    }
 }

package/functions/federationPartnership.d.ts

@@ -41,8 +41,6 @@ export declare namespace FederationPartnershipFbFunctionsTypes {
         federationId: string;
         partnershipId: string;
         formData: {
-            memberCount: number;
-            partnerCount: number;
             displayName: string;
             photoURL: string;
             email: string;
@@ -61,8 +59,6 @@ export declare namespace FederationPartnershipFbFunctionsTypes {
         federationId: string;
         partnershipId: string;
         formData: {
-            memberCount: number;
-            partnerCount: number;
             displayName: string;
             photoURL: string;
             email: string;
@@ -72,4 +68,17 @@ export declare namespace FederationPartnershipFbFunctionsTypes {
         };
     }
     type EditManualResult = void;
+    interface EditCountManualParams {
+        federationId: string;
+        partnershipId: string;
+        formData: {
+            leaderCount: number;
+            memberCount: number;
+            partnerCount: number;
+            hasSchool: boolean;
+            teacherCount: number | null;
+            studentCount: number | null;
+        };
+    }
+    type EditCountManualResult = void;
 }

package/functions/index.d.ts

@@ -1,5 +1,6 @@
 export declare enum FbFunctionName {
     Auth = "auth",
+    FederationGetConfederation = "federation-getConfederation",
     CommunicationCommentPublish = "communicationComment-publish",
     CommunicationEdit = "communication-edit",
     CommunicationPublish = "communication-publish",
@@ -27,6 +28,7 @@ export declare enum FbFunctionName {
     FederationPartnershipAddManual = "federationPartnership-addManual",
     FederationPartnershipConnect = "federationPartnership-connect",
     FederationPartnershipEditManual = "federationPartnership-editManual",
+    FederationPartnershipEditCountManual = "federationPartnership-editCountManual",
     FederationPartnershipGetByToken = "federationPartnership-getByToken",
     FederationPartnershipRemove = "federationPartnership-remove",
     FederationPartnershipRemoveManual = "federationPartnership-removeManual",

package/functions/index.js

@@ -4,6 +4,7 @@ exports.FbFunctionName = void 0;
 var FbFunctionName;
 (function (FbFunctionName) {
     FbFunctionName["Auth"] = "auth";
+    FbFunctionName["FederationGetConfederation"] = "federation-getConfederation";
     FbFunctionName["CommunicationCommentPublish"] = "communicationComment-publish";
     FbFunctionName["CommunicationEdit"] = "communication-edit";
     FbFunctionName["CommunicationPublish"] = "communication-publish";
@@ -31,6 +32,7 @@ var FbFunctionName;
     FbFunctionName["FederationPartnershipAddManual"] = "federationPartnership-addManual";
     FbFunctionName["FederationPartnershipConnect"] = "federationPartnership-connect";
     FbFunctionName["FederationPartnershipEditManual"] = "federationPartnership-editManual";
+    FbFunctionName["FederationPartnershipEditCountManual"] = "federationPartnership-editCountManual";
     FbFunctionName["FederationPartnershipGetByToken"] = "federationPartnership-getByToken";
     FbFunctionName["FederationPartnershipRemove"] = "federationPartnership-remove";
     FbFunctionName["FederationPartnershipRemoveManual"] = "federationPartnership-removeManual";

package/functions/misc.d.ts

@@ -11,7 +11,7 @@ export declare namespace MiscFbFunctionsTypes {
         name?: string;
         lastname?: string;
         downloadEbook?: boolean;
-        groupId?: string;
+        groupId?: number;
     }
     type MiscAddSubscriberResult = void;
 }

package/functions/regions.js

@@ -71,9 +71,11 @@ const regionByFunctions = {
     [index_1.FbFunctionName.FederationPartnershipRemove]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationPartnershipRemoveManual]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationPartnershipEditManual]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.FederationPartnershipEditCountManual]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationPartnershipGetByToken]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationPartnershipConnect]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.FederationPartnershipSendInvitationToJoinEmail]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.FederationGetConfederation]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.MiscValidateUsername]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.NotificationMarkAllAsReaded]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.PartnerAdd]: GCloudRegions.EuropeWest6,

package/helpers/auth.d.ts

@@ -6,6 +6,7 @@ export interface AuthUserClaims {
     federation?: string;
     partnership?: string;
     superAdmin?: boolean;
+    besm?: boolean;
 }
 export declare enum AuthErrors {
     NoSuperAdmin = "error.auth.notSuperadmin",

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

@@ -9,4 +9,9 @@ export default class FederationPartnership extends PartnershipBasic<FederationPa
     get memberCount(): number;
     get partnerCount(): number;
     get token(): string | null;
+    get leaderCount(): number;
+    get hasSchool(): boolean;
+    get teacherCount(): number;
+    get studentCount(): number;
+    get updatedAt(): FirebaseFirestore.Timestamp | null;
 }

package/models/Federation/Partnership/index.js

@@ -27,5 +27,20 @@ class FederationPartnership extends basic_1.default {
     get token() {
         return this.data.token || null;
     }
+    get leaderCount() {
+        return this.data.leaderCount || 0;
+    }
+    get hasSchool() {
+        return this.data.hasSchool || false;
+    }
+    get teacherCount() {
+        return this.data.teacherCount || 0;
+    }
+    get studentCount() {
+        return this.data.studentCount || 0;
+    }
+    get updatedAt() {
+        return this.data.updatedAt || null;
+    }
 }
 exports.default = FederationPartnership;

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

@@ -2,7 +2,10 @@ import { Timestamp } from '@google-cloud/firestore';
 import { PartnershipBasicData } from '../../Partnership/types';
 export interface FederationPartnershipData extends PartnershipBasicData {
     connectedAt: Timestamp | null;
-    memberCount: number;
-    partnerCount: number;
+    leaderCount: number;
+    hasSchool: boolean;
+    teacherCount: number | null;
+    studentCount: number | null;
+    updatedAt: FirebaseFirestore.Timestamp | null;
     token: string | null;
 }

package/models/Federation/index.d.ts

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

package/models/Federation/index.js

@@ -3,6 +3,7 @@ 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 Model_1 = __importDefault(require("../Model"));
 class Federation extends Model_1.default {
     constructor(doc) {
@@ -41,6 +42,11 @@ class Federation extends Model_1.default {
     get address() {
         return this.data.address || null;
     }
+    get displayAddress() {
+        const { street, city, postalCode, province, country } = this.address || {};
+        const fields = [street, postalCode, city, province, country];
+        return fields.filter((field) => lodash_1.isString(field) && field.trim() !== '').join(', ');
+    }
     get partnershipConnectedIds() {
         return this.data.partnershipConnectedIds || [];
     }

package/package.json

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