@blackcode_sa/metaestetics-api 1.12.6 → 1.12.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.12.6",
+  "version": "1.12.8",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -95,7 +95,6 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@blackcode_sa/metaestetics-api": "^1.12.5",
     "axios": "^1.8.3",
     "expo-server-sdk": "^3.13.0",
     "firebase-admin": "^13.0.2",

package/src/services/clinic/billing-transactions.service.ts

@@ -0,0 +1,217 @@
+import {
+  collection,
+  getDocs,
+  query,
+  orderBy,
+  limit,
+  startAfter,
+  where,
+  DocumentSnapshot,
+  QueryConstraint,
+} from 'firebase/firestore';
+import { BaseService } from '../base.service';
+import {
+  BillingTransaction,
+  BillingTransactionType,
+  CLINIC_GROUPS_COLLECTION,
+} from '../../types/clinic';
+
+/**
+ * Service for managing billing transactions
+ * Provides read-only access to billing transaction history
+ */
+export class BillingTransactionsService extends BaseService {
+  private readonly BILLING_TRANSACTIONS_COLLECTION = 'billingTransactions';
+
+  /**
+   * Get billing transactions for a clinic group with pagination
+   * @param clinicGroupId - The clinic group ID
+   * @param options - Query options
+   * @returns Promise with transactions and pagination info
+   */
+  async getBillingTransactions(
+    clinicGroupId: string,
+    options: {
+      limit?: number;
+      startAfter?: DocumentSnapshot;
+      transactionType?: BillingTransactionType;
+    } = {},
+  ): Promise<{
+    transactions: BillingTransaction[];
+    lastDoc: DocumentSnapshot | null;
+    hasMore: boolean;
+  }> {
+    try {
+      const { limit: queryLimit = 50, startAfter: startAfterDoc, transactionType } = options;
+
+      // Build query constraints
+      const constraints: QueryConstraint[] = [];
+
+      // Add transaction type filter if specified
+      if (transactionType) {
+        constraints.push(where('type', '==', transactionType));
+      }
+
+      // Add ordering
+      constraints.push(orderBy('timestamp', 'desc')); // Most recent first
+
+      // Add pagination
+      if (startAfterDoc) {
+        constraints.push(startAfter(startAfterDoc));
+      }
+
+      constraints.push(limit(queryLimit + 1)); // Get one extra to check if there are more
+
+      // Execute query
+      const transactionsRef = collection(
+        this.db,
+        CLINIC_GROUPS_COLLECTION,
+        clinicGroupId,
+        this.BILLING_TRANSACTIONS_COLLECTION,
+      );
+
+      const q = query(transactionsRef, ...constraints);
+      const querySnapshot = await getDocs(q);
+
+      // Process results
+      const docs = querySnapshot.docs;
+      const hasMore = docs.length > queryLimit;
+      const transactions = docs.slice(0, queryLimit).map(doc => ({
+        id: doc.id,
+        ...doc.data(),
+      })) as BillingTransaction[];
+
+      const lastDoc = transactions.length > 0 ? docs[transactions.length - 1] : null;
+
+      return {
+        transactions,
+        lastDoc,
+        hasMore,
+      };
+    } catch (error) {
+      console.error(
+        `Error fetching billing transactions for clinic group ${clinicGroupId}:`,
+        error,
+      );
+      throw new Error(
+        `Failed to fetch billing transactions: ${
+          error instanceof Error ? error.message : 'Unknown error'
+        }`,
+      );
+    }
+  }
+
+  /**
+   * Get recent billing transactions (last 10)
+   * @param clinicGroupId - The clinic group ID
+   * @returns Promise with recent transactions
+   */
+  async getRecentBillingTransactions(clinicGroupId: string): Promise<BillingTransaction[]> {
+    const result = await this.getBillingTransactions(clinicGroupId, { limit: 10 });
+    return result.transactions;
+  }
+
+  /**
+   * Get billing transactions by type
+   * @param clinicGroupId - The clinic group ID
+   * @param transactionType - The transaction type to filter by
+   * @param options - Additional query options
+   * @returns Promise with filtered transactions
+   */
+  async getBillingTransactionsByType(
+    clinicGroupId: string,
+    transactionType: BillingTransactionType,
+    options: {
+      limit?: number;
+      startAfter?: DocumentSnapshot;
+    } = {},
+  ): Promise<{
+    transactions: BillingTransaction[];
+    lastDoc: DocumentSnapshot | null;
+    hasMore: boolean;
+  }> {
+    return this.getBillingTransactions(clinicGroupId, {
+      ...options,
+      transactionType,
+    });
+  }
+
+  /**
+   * Get subscription-related transactions only
+   * @param clinicGroupId - The clinic group ID
+   * @param options - Query options
+   * @returns Promise with subscription transactions
+   */
+  async getSubscriptionTransactions(
+    clinicGroupId: string,
+    options: {
+      limit?: number;
+      startAfter?: DocumentSnapshot;
+    } = {},
+  ): Promise<{
+    transactions: BillingTransaction[];
+    lastDoc: DocumentSnapshot | null;
+    hasMore: boolean;
+  }> {
+    try {
+      const { limit: queryLimit = 50, startAfter: startAfterDoc } = options;
+
+      // Subscription-related transaction types
+      const subscriptionTypes = [
+        BillingTransactionType.SUBSCRIPTION_CREATED,
+        BillingTransactionType.SUBSCRIPTION_ACTIVATED,
+        BillingTransactionType.SUBSCRIPTION_RENEWED,
+        BillingTransactionType.SUBSCRIPTION_UPDATED,
+        BillingTransactionType.SUBSCRIPTION_CANCELED,
+        BillingTransactionType.SUBSCRIPTION_REACTIVATED,
+        BillingTransactionType.SUBSCRIPTION_DELETED,
+      ];
+
+      const constraints: QueryConstraint[] = [
+        where('type', 'in', subscriptionTypes),
+        orderBy('timestamp', 'desc'),
+      ];
+
+      if (startAfterDoc) {
+        constraints.push(startAfter(startAfterDoc));
+      }
+
+      constraints.push(limit(queryLimit + 1));
+
+      const transactionsRef = collection(
+        this.db,
+        CLINIC_GROUPS_COLLECTION,
+        clinicGroupId,
+        this.BILLING_TRANSACTIONS_COLLECTION,
+      );
+
+      const q = query(transactionsRef, ...constraints);
+      const querySnapshot = await getDocs(q);
+
+      const docs = querySnapshot.docs;
+      const hasMore = docs.length > queryLimit;
+      const transactions = docs.slice(0, queryLimit).map(doc => ({
+        id: doc.id,
+        ...doc.data(),
+      })) as BillingTransaction[];
+
+      const lastDoc = transactions.length > 0 ? docs[transactions.length - 1] : null;
+
+      return {
+        transactions,
+        lastDoc,
+        hasMore,
+      };
+    } catch (error) {
+      console.error(
+        `Error fetching subscription transactions for clinic group ${clinicGroupId}:`,
+        error,
+      );
+      throw new Error(
+        `Failed to fetch subscription transactions: ${
+          error instanceof Error ? error.message : 'Unknown error'
+        }`,
+      );
+    }
+  }
+}

package/src/services/clinic/clinic-group.service.ts

@@ -11,8 +11,8 @@ import {
   Timestamp,
   serverTimestamp,
   FieldValue,
-} from "firebase/firestore";
-import { BaseService } from "../base.service";
+} from 'firebase/firestore';
+import { BaseService } from '../base.service';
 import {
   ClinicGroup,
   CreateClinicGroupData,
@@ -22,31 +22,28 @@ import {
   CreateAdminTokenData,
   ClinicGroupSetupData,
   UpdateClinicGroupData,
-} from "../../types/clinic";
-import { ClinicAdminService } from "./clinic-admin.service";
-import { geohashForLocation } from "geofire-common";
-import {
-  clinicGroupSchema,
-  createClinicGroupSchema,
-} from "../../validations/clinic.schema";
-import { z } from "zod";
-import { Auth } from "firebase/auth";
-import { Firestore } from "firebase/firestore";
-import { FirebaseApp } from "firebase/app";
-import * as ClinicGroupUtils from "./utils/clinic-group.utils";
-import { uploadPhoto } from "./utils/photos.utils";
+  BillingTransaction,
+  BillingTransactionType,
+} from '../../types/clinic';
+import { ClinicAdminService } from './clinic-admin.service';
+import { BillingTransactionsService } from './billing-transactions.service';
+import { geohashForLocation } from 'geofire-common';
+import { clinicGroupSchema, createClinicGroupSchema } from '../../validations/clinic.schema';
+import { z } from 'zod';
+import { Auth } from 'firebase/auth';
+import { Firestore } from 'firebase/firestore';
+import { FirebaseApp } from 'firebase/app';
+import * as ClinicGroupUtils from './utils/clinic-group.utils';
+import { uploadPhoto } from './utils/photos.utils';
 
 export class ClinicGroupService extends BaseService {
   private clinicAdminService: ClinicAdminService;
+  private billingTransactionsService: BillingTransactionsService;
 
-  constructor(
-    db: Firestore,
-    auth: Auth,
-    app: FirebaseApp,
-    clinicAdminService: ClinicAdminService
-  ) {
+  constructor(db: Firestore, auth: Auth, app: FirebaseApp, clinicAdminService: ClinicAdminService) {
     super(db, auth, app);
     this.clinicAdminService = clinicAdminService;
+    this.billingTransactionsService = new BillingTransactionsService(db, auth, app);
   }
 
   /**
@@ -55,7 +52,7 @@ export class ClinicGroupService extends BaseService {
   async createClinicGroup(
     data: CreateClinicGroupData,
     ownerId: string,
-    isDefault: boolean = false
+    isDefault: boolean = false,
   ): Promise<ClinicGroup> {
     return ClinicGroupUtils.createClinicGroup(
       this.db,
@@ -63,7 +60,7 @@ export class ClinicGroupService extends BaseService {
       ownerId,
       isDefault,
       this.clinicAdminService,
-      this.app
+      this.app,
     );
   }
 
@@ -84,10 +81,7 @@ export class ClinicGroupService extends BaseService {
   /**
    * Ažurira grupaciju klinika
    */
-  async updateClinicGroup(
-    groupId: string,
-    data: Partial<ClinicGroup>
-  ): Promise<ClinicGroup> {
+  async updateClinicGroup(groupId: string, data: Partial<ClinicGroup>): Promise<ClinicGroup> {
     return ClinicGroupUtils.updateClinicGroup(this.db, groupId, data, this.app);
   }
 
@@ -95,24 +89,14 @@ export class ClinicGroupService extends BaseService {
    * Dodaje admina u grupaciju
    */
   async addAdminToGroup(groupId: string, adminId: string): Promise<void> {
-    return ClinicGroupUtils.addAdminToGroup(
-      this.db,
-      groupId,
-      adminId,
-      this.app
-    );
+    return ClinicGroupUtils.addAdminToGroup(this.db, groupId, adminId, this.app);
   }
 
   /**
    * Uklanja admina iz grupacije
    */
   async removeAdminFromGroup(groupId: string, adminId: string): Promise<void> {
-    return ClinicGroupUtils.removeAdminFromGroup(
-      this.db,
-      groupId,
-      adminId,
-      this.app
-    );
+    return ClinicGroupUtils.removeAdminFromGroup(this.db, groupId, adminId, this.app);
   }
 
   /**
@@ -129,32 +113,29 @@ export class ClinicGroupService extends BaseService {
    * @param setupData - The setup data for the clinic group
    * @returns The updated clinic group
    */
-  async setupClinicGroup(
-    groupId: string,
-    setupData: ClinicGroupSetupData
-  ): Promise<ClinicGroup> {
-    console.log("[CLINIC_GROUP] Setting up clinic group", { groupId });
+  async setupClinicGroup(groupId: string, setupData: ClinicGroupSetupData): Promise<ClinicGroup> {
+    console.log('[CLINIC_GROUP] Setting up clinic group', { groupId });
 
     // Get the clinic group
     const clinicGroup = await this.getClinicGroup(groupId);
     if (!clinicGroup) {
-      console.error("[CLINIC_GROUP] Clinic group not found", { groupId });
+      console.error('[CLINIC_GROUP] Clinic group not found', { groupId });
       throw new Error(`Clinic group with ID ${groupId} not found`);
     }
 
     // Process logo if it's a data URL
     let logoUrl = setupData.logo;
-    if (logoUrl && typeof logoUrl === "string" && logoUrl.startsWith("data:")) {
-      console.log("[CLINIC_GROUP] Processing logo in setupClinicGroup");
+    if (logoUrl && typeof logoUrl === 'string' && logoUrl.startsWith('data:')) {
+      console.log('[CLINIC_GROUP] Processing logo in setupClinicGroup');
       try {
         const uploadedLogoUrl = await uploadPhoto(
           logoUrl,
-          "clinic-groups",
+          'clinic-groups',
           groupId,
-          "logo",
-          this.app
+          'logo',
+          this.app,
         );
-        console.log("[CLINIC_GROUP] Logo processed in setupClinicGroup", {
+        console.log('[CLINIC_GROUP] Logo processed in setupClinicGroup', {
           uploadedLogoUrl,
         });
 
@@ -163,10 +144,7 @@ export class ClinicGroupService extends BaseService {
           logoUrl = uploadedLogoUrl;
         }
       } catch (error) {
-        console.error(
-          "[CLINIC_GROUP] Error processing logo in setupClinicGroup:",
-          error
-        );
+        console.error('[CLINIC_GROUP] Error processing logo in setupClinicGroup:', error);
         // Continue with update even if logo upload fails
       }
     }
@@ -182,7 +160,7 @@ export class ClinicGroupService extends BaseService {
       businessIdentificationNumber: setupData.businessIdentificationNumber,
     };
 
-    console.log("[CLINIC_GROUP] Updating clinic group with setup data");
+    console.log('[CLINIC_GROUP] Updating clinic group with setup data');
 
     // Update the clinic group
     return this.updateClinicGroup(groupId, updateData);
@@ -194,64 +172,30 @@ export class ClinicGroupService extends BaseService {
   async createAdminToken(
     groupId: string,
     creatorAdminId: string,
-    data?: CreateAdminTokenData
+    data?: CreateAdminTokenData,
   ): Promise<AdminToken> {
-    return ClinicGroupUtils.createAdminToken(
-      this.db,
-      groupId,
-      creatorAdminId,
-      this.app,
-      data
-    );
+    return ClinicGroupUtils.createAdminToken(this.db, groupId, creatorAdminId, this.app, data);
   }
 
   /**
    * Verifikuje i koristi admin token
    */
-  async verifyAndUseAdminToken(
-    groupId: string,
-    token: string,
-    userRef: string
-  ): Promise<boolean> {
-    return ClinicGroupUtils.verifyAndUseAdminToken(
-      this.db,
-      groupId,
-      token,
-      userRef,
-      this.app
-    );
+  async verifyAndUseAdminToken(groupId: string, token: string, userRef: string): Promise<boolean> {
+    return ClinicGroupUtils.verifyAndUseAdminToken(this.db, groupId, token, userRef, this.app);
   }
 
   /**
    * Briše admin token
    */
-  async deleteAdminToken(
-    groupId: string,
-    tokenId: string,
-    adminId: string
-  ): Promise<void> {
-    return ClinicGroupUtils.deleteAdminToken(
-      this.db,
-      groupId,
-      tokenId,
-      adminId,
-      this.app
-    );
+  async deleteAdminToken(groupId: string, tokenId: string, adminId: string): Promise<void> {
+    return ClinicGroupUtils.deleteAdminToken(this.db, groupId, tokenId, adminId, this.app);
   }
 
   /**
    * Dohvata aktivne admin tokene
    */
-  async getActiveAdminTokens(
-    groupId: string,
-    adminId: string
-  ): Promise<AdminToken[]> {
-    return ClinicGroupUtils.getActiveAdminTokens(
-      this.db,
-      groupId,
-      adminId,
-      this.app
-    );
+  async getActiveAdminTokens(groupId: string, adminId: string): Promise<AdminToken[]> {
+    return ClinicGroupUtils.getActiveAdminTokens(this.db, groupId, adminId, this.app);
   }
 
   // TODO: Add a method to get all admin tokens for a clinic group (not just active ones)
@@ -274,9 +218,9 @@ export class ClinicGroupService extends BaseService {
     onboardingData: {
       completed?: boolean;
       step?: number;
-    }
+    },
   ): Promise<ClinicGroup> {
-    console.log("[CLINIC_GROUP] Updating onboarding status", {
+    console.log('[CLINIC_GROUP] Updating onboarding status', {
       groupId,
       onboardingData,
     });
@@ -294,7 +238,7 @@ export class ClinicGroupService extends BaseService {
    * @returns The updated clinic group
    */
   async setOnboardingStep(groupId: string, step: number): Promise<ClinicGroup> {
-    console.log("[CLINIC_GROUP] Setting onboarding step", { groupId, step });
+    console.log('[CLINIC_GROUP] Setting onboarding step', { groupId, step });
 
     return this.setOnboarding(groupId, { step, completed: false });
   }
@@ -306,8 +250,61 @@ export class ClinicGroupService extends BaseService {
    * @returns The updated clinic group
    */
   async completeOnboarding(groupId: string): Promise<ClinicGroup> {
-    console.log("[CLINIC_GROUP] Completing onboarding", { groupId });
+    console.log('[CLINIC_GROUP] Completing onboarding', { groupId });
 
     return this.setOnboarding(groupId, { completed: true });
   }
+
+  /**
+   * Get billing transactions for a clinic group
+   *
+   * @param groupId - The clinic group ID
+   * @param options - Query options for pagination and filtering
+   * @returns Promise with billing transactions and pagination info
+   */
+  async getBillingTransactions(
+    groupId: string,
+    options: {
+      limit?: number;
+      startAfter?: any;
+      transactionType?: BillingTransactionType;
+    } = {},
+  ): Promise<{
+    transactions: BillingTransaction[];
+    lastDoc: any;
+    hasMore: boolean;
+  }> {
+    return this.billingTransactionsService.getBillingTransactions(groupId, options);
+  }
+
+  /**
+   * Get recent billing transactions for a clinic group (last 10)
+   *
+   * @param groupId - The clinic group ID
+   * @returns Promise with recent billing transactions
+   */
+  async getRecentBillingTransactions(groupId: string): Promise<BillingTransaction[]> {
+    return this.billingTransactionsService.getRecentBillingTransactions(groupId);
+  }
+
+  /**
+   * Get subscription-related billing transactions for a clinic group
+   *
+   * @param groupId - The clinic group ID
+   * @param options - Query options for pagination
+   * @returns Promise with subscription transactions and pagination info
+   */
+  async getSubscriptionTransactions(
+    groupId: string,
+    options: {
+      limit?: number;
+      startAfter?: any;
+    } = {},
+  ): Promise<{
+    transactions: BillingTransaction[];
+    lastDoc: any;
+    hasMore: boolean;
+  }> {
+    return this.billingTransactionsService.getSubscriptionTransactions(groupId, options);
+  }
 }

package/src/services/clinic/index.ts

@@ -1,4 +1,5 @@
-export * from "./clinic.service";
-export * from "./clinic-admin.service";
-export * from "./clinic-group.service";
-export * from "./practitioner-invite.service";
+export * from './clinic.service';
+export * from './clinic-admin.service';
+export * from './clinic-group.service';
+export * from './practitioner-invite.service';
+export * from './billing-transactions.service';