@fairmint/canton-fairmint-sdk 0.0.22 → 0.0.24

package/dist/clients/postgres-db-api/fairmintDbClient.js

@@ -1,36 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FairmintDbClient = void 0;
-const pg_1 = require("pg");
-const config_1 = require("../shared/config");
-const types_1 = require("./types");
+const base_1 = require("./fairmint-db/base");
+const transfers_1 = require("./fairmint-db/transfers");
+const reward_coupons_1 = require("./fairmint-db/reward-coupons");
+const app_markers_1 = require("./fairmint-db/app-markers");
+const parties_1 = require("./fairmint-db/parties");
+const ocf_deployments_1 = require("./fairmint-db/ocf-deployments");
+const time_series_1 = require("./fairmint-db/time-series");
+const valuation_reports_1 = require("./fairmint-db/valuation-reports");
+/**
+ * FairmintDbClient provides database access for the Fairmint application.
+ *
+ * This class uses a composition pattern, delegating to domain-specific
+ * repositories for better maintainability and code organization.
+ */
 class FairmintDbClient {
     constructor(network) {
-        // Initialize the shared config which handles environment loading
-        this.config = new config_1.ProviderConfig();
-        // Use provided network or get from environment variable, defaulting to devnet
         this.network = network;
-        const databaseUrl = this.getDatabaseUrl();
-        if (databaseUrl) {
-            // Extract database name from URL for debugging (without exposing credentials)
-            const dbNameMatch = databaseUrl.match(/\/\/([^:]+:[^@]+@)?[^\/]+\/([^?]+)/);
-            const _dbName = dbNameMatch ? dbNameMatch[2] : 'unknown';
-        }
-        if (!databaseUrl) {
-            throw new Error(`Fairmint database URL for ${this.network} is not configured. Please set POSTGRES_DB_URL_${this.network.toUpperCase()} environment variable.`);
-        }
-        this.pool = new pg_1.Pool({
-            connectionString: databaseUrl,
-            ssl: { rejectUnauthorized: false },
-        });
-        // Test the connection
-        this.pool.on('error', err => {
-            console.error('Unexpected error on idle client', err);
-            process.exit(-1);
-        });
-    }
-    getDatabaseUrl() {
-        return this.config.getDatabaseUrl(this.network);
+        const { pool, config } = (0, base_1.createFairmintDbPool)(network);
+        this.pool = pool;
+        this.config = config;
+        // Initialize repositories
+        this.transfers = new transfers_1.TransfersRepository(pool, config, network);
+        this.rewardCoupons = new reward_coupons_1.RewardCouponsRepository(pool, config, network);
+        this.appMarkers = new app_markers_1.AppMarkersRepository(pool, config, network);
+        this.ocfDeployments = new ocf_deployments_1.OcfDeploymentsRepository(pool, config, network);
+        this.timeSeries = new time_series_1.TimeSeriesRepository(pool, config, network);
+        this.valuationReports = new valuation_reports_1.ValuationReportsRepository(pool, config, network);
+        // Parties needs transfers for payment statistics
+        this.parties = new parties_1.PartiesRepository(pool, config, network, this.transfers);
     }
     getNetwork() {
         return this.network;
@@ -41,3042 +40,313 @@ class FairmintDbClient {
     async close() {
         await this.pool.end();
     }
-    // Canton Transfers CRUD operations
+    // ========================================================================
+    // Transfer Operations
+    // ========================================================================
     async insertCantonTransfer(transfer) {
-        const query = `
-      INSERT INTO canton_transfers (
-        api_tracking_id, api_expires_at,
-        transfer_sender_party_id, transfer_receiver_party_id, transfer_amount,
-        transfer_description, transfer_burned_amount, receiver_holding_cids,
-        sender_change_cids, tx_update_id, tx_record_time,
-        status, app_reward_coupon_id
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
-      RETURNING *
-    `;
-        const values = [
-            transfer.api_tracking_id,
-            transfer.api_expires_at,
-            transfer.transfer_sender_party_id,
-            transfer.transfer_receiver_party_id,
-            transfer.transfer_amount,
-            transfer.transfer_description,
-            transfer.transfer_burned_amount,
-            transfer.receiver_holding_cids,
-            transfer.sender_change_cids,
-            transfer.tx_update_id,
-            transfer.tx_record_time,
-            transfer.status,
-            transfer.app_reward_coupon_id,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapTransferFromDb(result.rows[0]);
+        return this.transfers.insertCantonTransfer(transfer);
     }
     async getCantonTransfer(id) {
-        const query = 'SELECT * FROM canton_transfers WHERE id = $1';
-        const result = await this.pool.query(query, [id]);
-        return result.rows.length > 0
-            ? this.mapTransferFromDb(result.rows[0])
-            : null;
+        return this.transfers.getCantonTransfer(id);
     }
     async getCantonTransferByTrackingId(apiTrackingId) {
-        const query = 'SELECT * FROM canton_transfers WHERE api_tracking_id = $1';
-        const result = await this.pool.query(query, [apiTrackingId]);
-        return result.rows.length > 0
-            ? this.mapTransferFromDb(result.rows[0])
-            : null;
+        return this.transfers.getCantonTransferByTrackingId(apiTrackingId);
     }
     async getSubmittedTransfers() {
-        const query = `
-      SELECT * FROM canton_transfers
-      WHERE status = $1
-      ORDER BY created_at ASC
-    `;
-        const result = await this.pool.query(query, [types_1.TransferStatus.SUBMITTED]);
-        return result.rows.map(row => this.mapTransferFromDb(row));
+        return this.transfers.getSubmittedTransfers();
     }
     async updateCantonTransfer(id, updates) {
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        values.push(id);
-        const query = `
-      UPDATE canton_transfers
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE id = $${paramIndex}
-      RETURNING *
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.length > 0
-            ? this.mapTransferFromDb(result.rows[0])
-            : null;
-    }
-    // Canton App Reward Coupons CRUD operations
+        return this.transfers.updateCantonTransfer(id, updates);
+    }
+    async getMonthlyPaymentTotalForParty(partyId, roundDurationMinutes = 10) {
+        return this.transfers.getMonthlyPaymentTotalForParty(partyId, roundDurationMinutes);
+    }
+    getRemainingRoundsInMonth(roundDurationMinutes = 10) {
+        return this.transfers.getRemainingRoundsInMonth(roundDurationMinutes);
+    }
+    async getMonthlyPaymentTotalsForParties(partyIds) {
+        return this.transfers.getMonthlyPaymentTotalsForParties(partyIds);
+    }
+    async getLifetimePaymentStatisticsForParties(partyIds) {
+        return this.transfers.getLifetimePaymentStatisticsForParties(partyIds);
+    }
+    // ========================================================================
+    // Reward Coupon Operations
+    // ========================================================================
     async insertCantonAppRewardCoupon(coupon) {
-        const query = `
-      INSERT INTO canton_app_reward_coupons (
-        status, tx_update_id, tx_record_time, contract_id, template_id, package_name,
-        dso_party_id, provider_party_id, featured, round_number, beneficiary_party_id, coupon_amount
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-      RETURNING *
-    `;
-        const values = [
-            coupon.status,
-            coupon.tx_update_id,
-            coupon.tx_record_time,
-            coupon.contract_id,
-            coupon.template_id,
-            coupon.package_name,
-            coupon.dso_party_id,
-            coupon.provider_party_id,
-            coupon.featured,
-            coupon.round_number,
-            coupon.beneficiary_party_id,
-            coupon.coupon_amount,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapRewardCouponFromDb(result.rows[0]);
+        return this.rewardCoupons.insertCantonAppRewardCoupon(coupon);
     }
     async batchInsertCantonAppRewardCoupons(coupons) {
-        if (coupons.length === 0) {
-            return { insertedCount: 0, skippedCount: 0 };
-        }
-        // Build the VALUES clause with placeholders
-        const valuesPlaceholders = coupons
-            .map((_, idx) => `($${idx * 12 + 1}, $${idx * 12 + 2}, $${idx * 12 + 3}, $${idx * 12 + 4}, $${idx * 12 + 5}, $${idx * 12 + 6}, $${idx * 12 + 7}, $${idx * 12 + 8}, $${idx * 12 + 9}, $${idx * 12 + 10}, $${idx * 12 + 11}, $${idx * 12 + 12})`)
-            .join(', ');
-        const query = `
-      INSERT INTO canton_app_reward_coupons (
-        status, tx_update_id, tx_record_time, contract_id, template_id, package_name,
-        dso_party_id, provider_party_id, featured, round_number, beneficiary_party_id, coupon_amount
-      ) VALUES ${valuesPlaceholders}
-      ON CONFLICT (contract_id) DO NOTHING
-      RETURNING *
-    `;
-        // Flatten all coupon values into a single array
-        const values = coupons.flatMap(coupon => [
-            coupon.status,
-            coupon.tx_update_id,
-            coupon.tx_record_time,
-            coupon.contract_id,
-            coupon.template_id,
-            coupon.package_name,
-            coupon.dso_party_id,
-            coupon.provider_party_id,
-            coupon.featured,
-            coupon.round_number,
-            coupon.beneficiary_party_id,
-            coupon.coupon_amount,
-        ]);
-        const result = await this.pool.query(query, values);
-        const insertedCount = result.rowCount ?? 0;
-        const skippedCount = coupons.length - insertedCount;
-        return { insertedCount, skippedCount };
+        return this.rewardCoupons.batchInsertCantonAppRewardCoupons(coupons);
     }
     async upsertCantonAppRewardCouponWithStatus(coupon) {
-        const query = `
-      INSERT INTO canton_app_reward_coupons (
-        status, tx_update_id, tx_record_time, contract_id, template_id, package_name,
-        dso_party_id, provider_party_id, featured, round_number, beneficiary_party_id, coupon_amount
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-      ON CONFLICT (contract_id) DO UPDATE
-      SET status = EXCLUDED.status, updated_at = NOW()
-      RETURNING *
-    `;
-        const values = [
-            coupon.status,
-            coupon.tx_update_id,
-            coupon.tx_record_time,
-            coupon.contract_id,
-            coupon.template_id,
-            coupon.package_name,
-            coupon.dso_party_id,
-            coupon.provider_party_id,
-            coupon.featured,
-            coupon.round_number,
-            coupon.beneficiary_party_id,
-            coupon.coupon_amount,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapRewardCouponFromDb(result.rows[0]);
+        return this.rewardCoupons.upsertCantonAppRewardCouponWithStatus(coupon);
     }
     async getCantonAppRewardCoupon(id) {
-        const query = 'SELECT * FROM canton_app_reward_coupons WHERE id = $1';
-        const result = await this.pool.query(query, [id]);
-        return result.rows.length > 0
-            ? this.mapRewardCouponFromDb(result.rows[0])
-            : null;
+        return this.rewardCoupons.getCantonAppRewardCoupon(id);
     }
     async getCantonAppRewardCouponByContractId(contractId) {
-        const query = 'SELECT * FROM canton_app_reward_coupons WHERE contract_id = $1';
-        const result = await this.pool.query(query, [contractId]);
-        return result.rows.length > 0
-            ? this.mapRewardCouponFromDb(result.rows[0])
-            : null;
+        return this.rewardCoupons.getCantonAppRewardCouponByContractId(contractId);
     }
     async getCantonAppRewardCouponsByContractIds(contractIds) {
-        if (contractIds.length === 0) {
-            return [];
-        }
-        const placeholders = contractIds
-            .map((_, index) => `$${index + 1}`)
-            .join(', ');
-        const query = `
-      SELECT * FROM canton_app_reward_coupons
-      WHERE contract_id IN (${placeholders})
-    `;
-        const result = await this.pool.query(query, contractIds);
-        return result.rows.map(row => this.mapRewardCouponFromDb(row));
+        return this.rewardCoupons.getCantonAppRewardCouponsByContractIds(contractIds);
     }
     async getCantonAppRewardCouponsByStatus(status, limit = 100, sortOrder = 'ASC', beneficiaryPartyId) {
-        let query = `
-      SELECT * FROM canton_app_reward_coupons
-      WHERE status = $1
-    `;
-        const params = [status];
-        if (beneficiaryPartyId) {
-            query += ` AND beneficiary_party_id = $${params.length + 1}`;
-            params.push(beneficiaryPartyId);
-        }
-        query += ` ORDER BY tx_record_time ${sortOrder} LIMIT $${params.length + 1}`;
-        params.push(limit);
-        const result = await this.pool.query(query, params);
-        return result.rows.map(row => this.mapRewardCouponFromDb(row));
+        return this.rewardCoupons.getCantonAppRewardCouponsByStatus(status, limit, sortOrder, beneficiaryPartyId);
     }
     async countCantonAppRewardCouponsByStatus(status) {
-        const query = `
-      SELECT COUNT(*) FROM canton_app_reward_coupons
-      WHERE status = $1
-    `;
-        const result = await this.pool.query(query, [status]);
-        return result.rows[0].count;
+        return this.rewardCoupons.countCantonAppRewardCouponsByStatus(status);
     }
     async getOldestCreatedCantonAppRewardCoupons(limit = 100) {
-        const query = `
-      SELECT * FROM canton_app_reward_coupons
-      WHERE status = 'created'
-      ORDER BY tx_record_time ASC
-      LIMIT $1
-    `;
-        const result = await this.pool.query(query, [limit]);
-        return result.rows.map(row => this.mapRewardCouponFromDb(row));
+        return this.rewardCoupons.getOldestCreatedCantonAppRewardCoupons(limit);
     }
     async getCantonAppRewardCouponsByDateRange(startDate, endDate, status, limit = 1000, sortOrder = 'ASC') {
-        let query = `
-      SELECT * FROM canton_app_reward_coupons
-      WHERE tx_archive_record_time >= $1 AND tx_archive_record_time <= $2
-    `;
-        const values = [startDate, endDate];
-        let paramIndex = 3;
-        if (status) {
-            query += ` AND status = $${paramIndex}`;
-            values.push(status);
-            paramIndex++;
-        }
-        query += ` ORDER BY tx_archive_record_time ${sortOrder} LIMIT $${paramIndex}`;
-        values.push(limit);
-        const result = await this.pool.query(query, values);
-        return result.rows.map(row => this.mapRewardCouponFromDb(row));
+        return this.rewardCoupons.getCantonAppRewardCouponsByDateRange(startDate, endDate, status, limit, sortOrder);
     }
     async updateCantonAppRewardCoupon(id, updates) {
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        values.push(id);
-        const query = `
-      UPDATE canton_app_reward_coupons
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE id = $${paramIndex}
-      RETURNING *
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.length > 0
-            ? this.mapRewardCouponFromDb(result.rows[0])
-            : null;
+        return this.rewardCoupons.updateCantonAppRewardCoupon(id, updates);
     }
     async batchUpdateCantonAppRewardCouponsByContractIds(contractIds, updates) {
-        if (contractIds.length === 0) {
-            return [];
-        }
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        // Build the WHERE clause for contract IDs
-        const contractIdPlaceholders = contractIds
-            .map((_, index) => `$${paramIndex + index}`)
-            .join(', ');
-        values.push(...contractIds);
-        const query = `
-      UPDATE canton_app_reward_coupons
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE contract_id IN (${contractIdPlaceholders})
-      RETURNING *
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.map(row => this.mapRewardCouponFromDb(row));
+        return this.rewardCoupons.batchUpdateCantonAppRewardCouponsByContractIds(contractIds, updates);
     }
     async getRewardCoupons(options = {}) {
-        const { limit = 100, order = 'oldest', redeemed = 'Both' } = options;
-        let query = `
-      SELECT
-        c.id as coupon_id,
-        c.status as coupon_status,
-        c.tx_update_id as coupon_tx_update_id,
-        c.tx_record_time as coupon_tx_record_time,
-        c.contract_id as coupon_contract_id,
-        c.template_id as coupon_template_id,
-        c.package_name as coupon_package_name,
-        c.dso_party_id as coupon_dso_party_id,
-        c.provider_party_id as coupon_provider_party_id,
-        c.featured as coupon_featured,
-        c.round_number as coupon_round_number,
-        c.beneficiary_party_id as coupon_beneficiary_party_id,
-        c.coupon_amount as coupon_coupon_amount,
-        c.tx_archive_update_id as coupon_tx_archive_update_id,
-        c.tx_archive_record_time as coupon_tx_archive_record_time,
-        c.app_reward_amount as coupon_app_reward_amount,
-        c.created_at as coupon_created_at,
-        c.updated_at as coupon_updated_at,
-        t.id as transfer_id,
-        t.status as transfer_status,
-        t.api_tracking_id as transfer_api_tracking_id,
-        t.api_expires_at as transfer_api_expires_at,
-        t.transfer_sender_party_id as transfer_transfer_sender_party_id,
-        t.transfer_receiver_party_id as transfer_transfer_receiver_party_id,
-        t.transfer_amount as transfer_transfer_amount,
-        t.transfer_description as transfer_transfer_description,
-        t.transfer_burned_amount as transfer_transfer_burned_amount,
-        t.receiver_holding_cids as transfer_receiver_holding_cids,
-        t.sender_change_cids as transfer_sender_change_cids,
-        t.tx_update_id as transfer_tx_update_id,
-        t.tx_record_time as transfer_tx_record_time,
-        t.app_reward_coupon_id as transfer_app_reward_coupon_id,
-        t.created_at as transfer_created_at,
-        t.updated_at as transfer_updated_at,
-        r.id as redemption_id,
-        r.tx_update_id as redemption_tx_update_id,
-        r.tx_record_time as redemption_tx_record_time,
-        r.tx_synchronizer_id as redemption_tx_synchronizer_id,
-        r.tx_effective_at as redemption_tx_effective_at,
-        r.total_app_rewards,
-        r.created_at as redemption_created_at,
-        r.updated_at as redemption_updated_at
-      FROM canton_app_reward_coupons c
-      LEFT JOIN canton_transfers t ON t.app_reward_coupon_id = c.id
-    `;
-        const conditions = [];
-        const values = [];
-        const paramIndex = 1;
-        // Filter by redemption status
-        if (redeemed === 'Unredeemed') {
-            conditions.push('r.id IS NULL');
-        }
-        else if (redeemed === 'Redeemed') {
-            conditions.push('r.id IS NOT NULL');
-        }
-        if (conditions.length > 0) {
-            query += ` WHERE ${conditions.join(' AND ')}`;
-        }
-        // Order by
-        query += ` ORDER BY c.tx_record_time ${order === 'oldest' ? 'ASC' : 'DESC'}`;
-        // Limit
-        query += ` LIMIT $${paramIndex}`;
-        values.push(limit);
-        const result = await this.pool.query(query, values);
-        return result.rows.map(row => this.mapRewardCouponWithTransferFromDb(row));
+        return this.rewardCoupons.getRewardCoupons(options);
     }
     async getRewardCoupon(options) {
-        const { contract_id } = options;
-        const query = `
-      SELECT
-        c.id as coupon_id,
-        c.status as coupon_status,
-        c.tx_update_id as coupon_tx_update_id,
-        c.tx_record_time as coupon_tx_record_time,
-        c.contract_id as coupon_contract_id,
-        c.template_id as coupon_template_id,
-        c.package_name as coupon_package_name,
-        c.dso_party_id as coupon_dso_party_id,
-        c.provider_party_id as coupon_provider_party_id,
-        c.featured as coupon_featured,
-        c.round_number as coupon_round_number,
-        c.beneficiary_party_id as coupon_beneficiary_party_id,
-        c.coupon_amount as coupon_coupon_amount,
-        c.tx_archive_update_id as coupon_tx_archive_update_id,
-        c.tx_archive_record_time as coupon_tx_archive_record_time,
-        c.app_reward_amount as coupon_app_reward_amount,
-        c.created_at as coupon_created_at,
-        c.updated_at as coupon_updated_at,
-        t.id as transfer_id,
-        t.status as transfer_status,
-        t.api_tracking_id as transfer_api_tracking_id,
-        t.api_expires_at as transfer_api_expires_at,
-        t.transfer_sender_party_id as transfer_transfer_sender_party_id,
-        t.transfer_receiver_party_id as transfer_transfer_receiver_party_id,
-        t.transfer_amount as transfer_transfer_amount,
-        t.transfer_description as transfer_transfer_description,
-        t.transfer_burned_amount as transfer_transfer_burned_amount,
-        t.receiver_holding_cids as transfer_receiver_holding_cids,
-        t.sender_change_cids as transfer_sender_change_cids,
-        t.tx_update_id as transfer_tx_update_id,
-        t.tx_record_time as transfer_tx_record_time,
-        t.app_reward_coupon_id as transfer_app_reward_coupon_id,
-        t.created_at as transfer_created_at,
-        t.updated_at as transfer_updated_at,
-        r.id as redemption_id,
-        r.tx_update_id as redemption_tx_update_id,
-        r.tx_record_time as redemption_tx_record_time,
-        r.tx_synchronizer_id as redemption_tx_synchronizer_id,
-        r.tx_effective_at as redemption_tx_effective_at,
-        r.total_app_rewards,
-        r.created_at as redemption_created_at,
-        r.updated_at as redemption_updated_at
-      FROM canton_app_reward_coupons c
-      LEFT JOIN canton_transfers t ON t.app_reward_coupon_id = c.id
-      WHERE c.contract_id = $1
-    `;
-        const result = await this.pool.query(query, [contract_id]);
-        return result.rows.length > 0
-            ? this.mapRewardCouponWithTransferFromDb(result.rows[0])
-            : null;
-    }
-    async getMonthlyTransferTotal(monthStart, monthEnd) {
-        const query = `
-      SELECT COALESCE(SUM(transfer_amount), 0) as total_amount
-      FROM canton_transfers
-      WHERE tx_record_time >= $1
-      AND tx_record_time <= $2
-      AND status IN ($3, $4)
-    `;
-        const result = await this.pool.query(query, [
-            monthStart,
-            monthEnd,
-            types_1.TransferStatus.CONFIRMED,
-            types_1.TransferStatus.PENDING,
-        ]);
-        const totalAmount = parseFloat(result.rows[0].total_amount);
-        return totalAmount;
+        return this.rewardCoupons.getRewardCoupon(options);
     }
     async getMonthlyAppRewardAmountTotal(monthStart, monthEnd) {
-        const query = `
-      SELECT COALESCE(SUM(app_reward_amount), 0) as total_amount
-      FROM canton_app_reward_coupons
-      WHERE created_at >= $1
-      AND created_at <= $2
-      AND app_reward_amount IS NOT NULL
-    `;
-        const result = await this.pool.query(query, [monthStart, monthEnd]);
-        const totalAmount = parseFloat(result.rows[0].total_amount);
-        return totalAmount;
-    }
-    async getTransferTimeSeriesData(timeRange, _metric = 'count', timePeriod, customStartDate) {
-        let interval;
-        let timeFilter;
-        let timeSeriesStart;
-        let timeSeriesEnd = 'NOW()';
-        let timeRangeInterval;
-        switch (timeRange) {
-            case '15m':
-                interval = 'minute';
-                timeFilter = "created_at >= NOW() - INTERVAL '15 minutes'";
-                timeRangeInterval = '15 minutes';
-                timeSeriesStart = "NOW() - INTERVAL '15 minutes'";
-                break;
-            case '1h':
-                interval = 'minute';
-                timeFilter = "created_at >= NOW() - INTERVAL '1 hour'";
-                timeRangeInterval = '1 hour';
-                timeSeriesStart = "NOW() - INTERVAL '1 hour'";
-                break;
-            case '6h':
-                interval = 'minute';
-                timeFilter = "created_at >= NOW() - INTERVAL '6 hours'";
-                timeRangeInterval = '6 hours';
-                timeSeriesStart = "NOW() - INTERVAL '6 hours'";
-                break;
-            case '1d':
-                interval = 'hour';
-                timeFilter = "created_at >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-                break;
-            case '7d':
-                interval = 'hour';
-                timeFilter = "created_at >= NOW() - INTERVAL '7 days'";
-                timeRangeInterval = '7 days';
-                timeSeriesStart = "NOW() - INTERVAL '7 days'";
-                break;
-            case '30d':
-                interval = 'day';
-                timeFilter = "created_at >= NOW() - INTERVAL '30 days'";
-                timeRangeInterval = '30 days';
-                timeSeriesStart = "NOW() - INTERVAL '30 days'";
-                break;
-            case 'last-month':
-                interval = 'day';
-                timeFilter =
-                    "created_at >= date_trunc('month', current_date - interval '1 month') AND created_at < date_trunc('month', current_date)";
-                timeRangeInterval = '1 month';
-                timeSeriesStart =
-                    "date_trunc('month', current_date - interval '1 month')";
-                timeSeriesEnd = "date_trunc('month', current_date)";
-                break;
-            case 'all':
-                interval = 'day';
-                timeFilter = '1=1';
-                timeRangeInterval = '100 years';
-                timeSeriesStart = "'2023-01-01'::timestamp";
-                break;
-            default:
-                interval = 'hour';
-                timeFilter = "created_at >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-        }
-        // If custom start date is provided, override the timeFilter and time series start/end
-        if (timePeriod === 'custom-start' && customStartDate) {
-            timeFilter = `created_at >= '${customStartDate}:00' AND created_at < ('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-            timeSeriesStart = `'${customStartDate}:00'::timestamp`;
-            timeSeriesEnd = `('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-        }
-        const query = `
-      WITH time_series AS (
-        SELECT generate_series(
-          date_trunc('${interval}', ${timeSeriesStart}),
-          date_trunc('${interval}', ${timeSeriesEnd}),
-          INTERVAL '1 ${interval}'
-        ) AS timestamp
-      ),
-      transfer_data AS (
-        SELECT
-          date_trunc('${interval}', created_at) AS timestamp,
-          COUNT(*) as count,
-          COALESCE(SUM(transfer_amount), 0) as amount
-        FROM canton_transfers
-        WHERE ${timeFilter}
-        AND status IN ('pending', 'submitted', 'confirmed')
-        GROUP BY date_trunc('${interval}', created_at)
-      )
-      SELECT
-        ts.timestamp::text,
-        COALESCE(td.count, 0) as count,
-        COALESCE(td.amount, 0) as amount
-      FROM time_series ts
-      LEFT JOIN transfer_data td ON ts.timestamp = td.timestamp
-      ORDER BY ts.timestamp ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            timestamp: row.timestamp,
-            count: parseInt(row.count, 10),
-            amount: parseFloat(row.amount),
-        }));
-    }
-    async getRewardCouponTimeSeriesData(timeRange, _metric = 'count', timePeriod, customStartDate, partyFilter, couponStatus = 'all') {
-        let interval;
-        let timeFilter;
-        let timeSeriesStart;
-        let timeSeriesEnd = 'NOW()';
-        let timeRangeInterval;
-        switch (timeRange) {
-            case '15m':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '15 minutes'";
-                timeRangeInterval = '15 minutes';
-                timeSeriesStart = "NOW() - INTERVAL '15 minutes'";
-                break;
-            case '1h':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 hour'";
-                timeRangeInterval = '1 hour';
-                timeSeriesStart = "NOW() - INTERVAL '1 hour'";
-                break;
-            case '6h':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '6 hours'";
-                timeRangeInterval = '6 hours';
-                timeSeriesStart = "NOW() - INTERVAL '6 hours'";
-                break;
-            case '1d':
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-                break;
-            case '7d':
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '7 days'";
-                timeRangeInterval = '7 days';
-                timeSeriesStart = "NOW() - INTERVAL '7 days'";
-                break;
-            case '30d':
-                interval = 'day';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '30 days'";
-                timeRangeInterval = '30 days';
-                timeSeriesStart = "NOW() - INTERVAL '30 days'";
-                break;
-            case 'last-month':
-                interval = 'day';
-                timeFilter =
-                    "tx_record_time >= date_trunc('month', current_date - interval '1 month') AND tx_record_time < date_trunc('month', current_date)";
-                timeRangeInterval = '1 month';
-                timeSeriesStart =
-                    "date_trunc('month', current_date - interval '1 month')";
-                timeSeriesEnd = "date_trunc('month', current_date)";
-                break;
-            case 'all':
-                interval = 'day'; // Default to daily for 'all' to avoid too many points
-                timeFilter = '1=1';
-                timeRangeInterval = '100 years'; // Just for custom start calc
-                timeSeriesStart = "'2023-01-01'::timestamp"; // Reasonable start date
-                break;
-            default:
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-        }
-        // If custom start date is provided, override the timeFilter and time series start/end
-        if (timePeriod === 'custom-start' && customStartDate) {
-            timeFilter = `tx_record_time >= '${customStartDate}:00' AND tx_record_time < ('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-            timeSeriesStart = `'${customStartDate}:00'::timestamp`;
-            timeSeriesEnd = `('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-        }
-        // Add party filter if provided
-        const partyCondition = partyFilter
-            ? ` AND beneficiary_party_id = '${partyFilter}'`
-            : '';
-        // Add status filter based on couponStatus
-        // 'created' = not yet archived, 'archived' = has been collected
-        // 'all' = all coupons regardless of archive status
-        let statusCondition = '';
-        if (couponStatus === 'created') {
-            statusCondition = ` AND status = 'created'`;
-        }
-        else if (couponStatus === 'archived') {
-            statusCondition = ` AND status = 'archived'`;
-        }
-        // When couponStatus === 'all', no filter is applied (statusCondition remains '')
-        const query = `
-      WITH time_series AS (
-        SELECT generate_series(
-          date_trunc('${interval}', ${timeSeriesStart}),
-          date_trunc('${interval}', ${timeSeriesEnd}),
-          INTERVAL '1 ${interval}'
-        ) AS timestamp
-      ),
-      coupon_data AS (
-        SELECT
-          date_trunc('${interval}', tx_record_time) AS timestamp,
-          COUNT(*) as count,
-          COALESCE(SUM(app_reward_amount), 0) as amount,
-          COALESCE(SUM(coupon_amount), 0) as coupon_amount
-        FROM canton_app_reward_coupons
-        WHERE ${timeFilter}${partyCondition}${statusCondition}
-        GROUP BY date_trunc('${interval}', tx_record_time)
-      )
-      SELECT
-        ts.timestamp::text,
-        COALESCE(cd.count, 0) as count,
-        COALESCE(cd.amount, 0) as amount,
-        COALESCE(cd.coupon_amount, 0) as coupon_amount
-      FROM time_series ts
-      LEFT JOIN coupon_data cd ON ts.timestamp = cd.timestamp
-      ORDER BY ts.timestamp ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            timestamp: row.timestamp,
-            count: parseInt(row.count, 10),
-            amount: parseFloat(row.amount),
-            couponAmount: parseFloat(row.coupon_amount),
-        }));
-    }
-    async getRewardCouponRoundSeriesData(timeRange, _metric = 'count', timePeriod, customStartDate, partyFilter, couponStatus = 'all') {
-        let timeRangeInterval;
-        let timeFilter;
-        switch (timeRange) {
-            case '15m':
-                timeRangeInterval = '15 minutes';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '15 minutes'";
-                break;
-            case '1h':
-                timeRangeInterval = '1 hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 hour'";
-                break;
-            case '6h':
-                timeRangeInterval = '6 hours';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '6 hours'";
-                break;
-            case '1d':
-                timeRangeInterval = '1 day';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-                break;
-            case '7d':
-                timeRangeInterval = '7 days';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '7 days'";
-                break;
-            case '30d':
-                timeRangeInterval = '30 days';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '30 days'";
-                break;
-            case 'last-month':
-                timeRangeInterval = '1 month';
-                timeFilter =
-                    "tx_record_time >= date_trunc('month', current_date - interval '1 month') AND tx_record_time < date_trunc('month', current_date)";
-                break;
-            case 'all':
-            default:
-                timeRangeInterval = '1 day';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-        }
-        if (timePeriod === 'custom-start' && customStartDate) {
-            timeFilter = `tx_record_time >= '${customStartDate}:00' AND tx_record_time < ('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-        }
-        // Add party filter if provided
-        const partyCondition = partyFilter
-            ? ` AND beneficiary_party_id = '${partyFilter}'`
-            : '';
-        // Add status filter based on couponStatus
-        // 'created' = not yet archived, 'archived' = has been collected
-        // 'all' = all coupons regardless of archive status
-        let statusCondition = '';
-        if (couponStatus === 'created') {
-            statusCondition = ` AND status = 'created'`;
-        }
-        else if (couponStatus === 'archived') {
-            statusCondition = ` AND status = 'archived'`;
-        }
-        // When couponStatus === 'all', no filter is applied (statusCondition remains '')
-        const query = `
-      WITH time_filtered AS (
-        SELECT round_number
-        FROM canton_app_reward_coupons
-        WHERE ${timeFilter}${partyCondition}${statusCondition}
-      ),
-      round_bounds AS (
-        SELECT
-          COALESCE(MIN(round_number), 0) AS min_round,
-          COALESCE(MAX(round_number), 0) AS max_round
-        FROM time_filtered
-      ),
-      rounds AS (
-        SELECT generate_series(
-          GREATEST((SELECT min_round FROM round_bounds), 0),
-          GREATEST((SELECT max_round FROM round_bounds), 0)
-        ) AS round
-        WHERE (SELECT max_round FROM round_bounds) > 0
-      ),
-      coupon_data AS (
-        SELECT
-          round_number AS round,
-          MIN(tx_record_time) AS timestamp,
-          COUNT(*) AS count,
-          COALESCE(SUM(app_reward_amount), 0) AS amount,
-          COALESCE(SUM(coupon_amount), 0) AS coupon_amount
-        FROM canton_app_reward_coupons
-        WHERE round_number IN (SELECT round FROM rounds)${partyCondition}${statusCondition}
-        GROUP BY round_number
-      )
-      SELECT
-        r.round,
-        cd.timestamp,
-        COALESCE(cd.count, 0) AS count,
-        COALESCE(cd.amount, 0) AS amount,
-        COALESCE(cd.coupon_amount, 0) AS coupon_amount
-      FROM rounds r
-      LEFT JOIN coupon_data cd ON cd.round = r.round
-      ORDER BY r.round ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            timestamp: row.timestamp
-                ? new Date(row.timestamp).toISOString()
-                : new Date().toISOString(),
-            count: parseInt(row.count, 10),
-            amount: parseFloat(row.amount),
-            couponAmount: parseFloat(row.coupon_amount),
-            round: typeof row.round === 'number' ? row.round : parseInt(row.round, 10),
-        }));
+        return this.rewardCoupons.getMonthlyAppRewardAmountTotal(monthStart, monthEnd);
     }
     async getLatestCouponAmounts() {
-        const query = `
-      WITH latest AS (
-        SELECT DISTINCT ON (featured)
-          featured,
-          coupon_amount
-        FROM canton_app_reward_coupons
-        WHERE coupon_amount IS NOT NULL
-        ORDER BY featured, tx_record_time DESC
-      )
-      SELECT
-        MAX(coupon_amount) FILTER (WHERE featured) AS featured_amount,
-        MAX(coupon_amount) FILTER (WHERE NOT featured) AS unfeatured_amount
-      FROM latest
-    `;
-        const result = await this.pool.query(query);
-        const row = result.rows[0] ?? {};
-        return {
-            featured: row.featured_amount !== null && row.featured_amount !== undefined
-                ? parseFloat(row.featured_amount)
-                : null,
-            unfeatured: row.unfeatured_amount !== null && row.unfeatured_amount !== undefined
-                ? parseFloat(row.unfeatured_amount)
-                : null,
-        };
+        return this.rewardCoupons.getLatestCouponAmounts();
     }
     async getLastAppRewardCouponTimestamp(partyFilter) {
-        const partyCondition = partyFilter
-            ? ` AND beneficiary_party_id = '${partyFilter}'`
-            : '';
-        const query = `
-      SELECT MAX(tx_record_time) AS last_timestamp
-      FROM canton_app_reward_coupons
-      WHERE status IN ('created', 'archived')
-        AND app_reward_amount IS NOT NULL${partyCondition}
-    `;
-        const result = await this.pool.query(query);
-        const timestamp = result.rows[0]?.last_timestamp;
-        return timestamp ? new Date(timestamp).toISOString() : null;
+        return this.rewardCoupons.getLastAppRewardCouponTimestamp(partyFilter);
     }
     async getLifetimeAppRewards() {
-        const query = `
-      SELECT COALESCE(SUM(app_reward_amount), 0) AS total
-      FROM canton_app_reward_coupons
-      WHERE status = 'archived'
-    `;
-        const result = await this.pool.query(query);
-        return Number(result.rows[0]?.total ?? 0);
+        return this.rewardCoupons.getLifetimeAppRewards();
     }
     async getUniqueCouponBeneficiaryParties() {
-        const query = `
-      SELECT DISTINCT
-        beneficiary_party_id as party_id,
-        beneficiary_party_id as display_name
-      FROM canton_app_reward_coupons
-      WHERE beneficiary_party_id IS NOT NULL
-      ORDER BY beneficiary_party_id ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
-    }
-    async getAppMarkerTimeSeriesData(timeRange, _metric = 'count', timePeriod, customStartDate, partyFilter, _statusFilter) {
-        let interval;
-        let timeFilter;
-        let timeSeriesStart;
-        let timeSeriesEnd = 'NOW()';
-        let timeRangeInterval;
-        switch (timeRange) {
-            case '15m':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '15 minutes'";
-                timeRangeInterval = '15 minutes';
-                timeSeriesStart = "NOW() - INTERVAL '15 minutes'";
-                break;
-            case '1h':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 hour'";
-                timeRangeInterval = '1 hour';
-                timeSeriesStart = "NOW() - INTERVAL '1 hour'";
-                break;
-            case '6h':
-                interval = 'minute';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '6 hours'";
-                timeRangeInterval = '6 hours';
-                timeSeriesStart = "NOW() - INTERVAL '6 hours'";
-                break;
-            case '1d':
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-                break;
-            case '7d':
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '7 days'";
-                timeRangeInterval = '7 days';
-                timeSeriesStart = "NOW() - INTERVAL '7 days'";
-                break;
-            case '30d':
-                interval = 'day';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '30 days'";
-                timeRangeInterval = '30 days';
-                timeSeriesStart = "NOW() - INTERVAL '30 days'";
-                break;
-            case 'last-month':
-                interval = 'day';
-                timeFilter =
-                    "tx_record_time >= date_trunc('month', current_date - interval '1 month') AND tx_record_time < date_trunc('month', current_date)";
-                timeRangeInterval = '1 month';
-                timeSeriesStart =
-                    "date_trunc('month', current_date - interval '1 month')";
-                timeSeriesEnd = "date_trunc('month', current_date)";
-                break;
-            case 'all':
-                interval = 'day';
-                timeFilter = '1=1';
-                timeRangeInterval = '100 years';
-                timeSeriesStart = "'2023-01-01'::timestamp";
-                break;
-            default:
-                interval = 'hour';
-                timeFilter = "tx_record_time >= NOW() - INTERVAL '1 day'";
-                timeRangeInterval = '1 day';
-                timeSeriesStart = "NOW() - INTERVAL '1 day'";
-        }
-        // If custom start date is provided, override the timeFilter and time series start/end
-        if (timePeriod === 'custom-start' && customStartDate) {
-            timeFilter = `tx_record_time >= '${customStartDate}:00' AND tx_record_time < ('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-            timeSeriesStart = `'${customStartDate}:00'::timestamp`;
-            timeSeriesEnd = `('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-        }
-        // Add party filter if provided
-        const partyCondition = partyFilter
-            ? ` AND beneficiary_party_id = '${partyFilter}'`
-            : '';
-        const query = `
-      WITH time_series AS (
-        SELECT generate_series(
-          date_trunc('${interval}', ${timeSeriesStart}),
-          date_trunc('${interval}', ${timeSeriesEnd}),
-          INTERVAL '1 ${interval}'
-        ) AS timestamp
-      ),
-      marker_data AS (
-        SELECT
-          date_trunc('${interval}', tx_record_time) AS timestamp,
-          COUNT(*) FILTER (WHERE status = 'archived') as archived_count,
-          COUNT(*) FILTER (WHERE status = 'created') as created_count,
-          COUNT(*) FILTER (WHERE status = 'archived') as archived_weight,
-          COUNT(*) FILTER (WHERE status = 'created') as created_weight
-        FROM canton_app_markers
-        WHERE ${timeFilter}${partyCondition}
-        GROUP BY date_trunc('${interval}', tx_record_time)
-      )
-      SELECT
-        ts.timestamp::text,
-        COALESCE(md.archived_count, 0) as archived_count,
-        COALESCE(md.created_count, 0) as created_count,
-        COALESCE(md.archived_count, 0) + COALESCE(md.created_count, 0) as count,
-        COALESCE(md.archived_weight, 0) as archived_weight,
-        COALESCE(md.created_weight, 0) as created_weight,
-        0 as amount,
-        0 as coupon_amount
-      FROM time_series ts
-      LEFT JOIN marker_data md ON ts.timestamp = md.timestamp
-      ORDER BY ts.timestamp ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            timestamp: row.timestamp,
-            count: parseInt(row.count, 10),
-            archivedCount: parseInt(row.archived_count, 10),
-            createdCount: parseInt(row.created_count, 10),
-            archivedWeight: parseFloat(row.archived_weight),
-            createdWeight: parseFloat(row.created_weight),
-            amount: 0,
-            couponAmount: 0,
-        }));
-    }
-    async getAppMarkerRoundSeriesData(timeRange, _metric = 'count', timePeriod, customStartDate, partyFilter, _statusFilter) {
-        let timeRangeInterval;
-        switch (timeRange) {
-            case '15m':
-                timeRangeInterval = '15 minutes';
-                break;
-            case '1h':
-                timeRangeInterval = '1 hour';
-                break;
-            case '6h':
-                timeRangeInterval = '6 hours';
-                break;
-            case '1d':
-                timeRangeInterval = '1 day';
-                break;
-            case '7d':
-                timeRangeInterval = '7 days';
-                break;
-            case '30d':
-                timeRangeInterval = '30 days';
-                break;
-            default:
-                timeRangeInterval = '1 day';
-        }
-        if (timePeriod === 'custom-start' && customStartDate) {
-            const _timeFilter = `tx_record_time >= '${customStartDate}:00' AND tx_record_time < ('${customStartDate}:00'::timestamp + INTERVAL '${timeRangeInterval}')`;
-            void _timeFilter;
-        }
-        // Add party filter if provided
-        const _partyCondition = partyFilter
-            ? ` AND beneficiary_party_id = '${partyFilter}'`
-            : '';
-        void _partyCondition;
-        // Note: Markers don't have round numbers, so we just return time-based groupings
-        // This method shouldn't be used for markers - use getAppMarkerTimeSeriesData instead
-        // Returning empty result set as markers don't have rounds
-        const query = `
-      SELECT
-        0::bigint as round,
-        NOW()::text as timestamp,
-        0::bigint as archived_count,
-        0::bigint as created_count,
-        0::bigint as count,
-        0::numeric as archived_weight,
-        0::numeric as created_weight,
-        0::numeric as amount,
-        0::numeric as coupon_amount
-      WHERE false
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            timestamp: row.timestamp
-                ? new Date(row.timestamp).toISOString()
-                : new Date().toISOString(),
-            count: parseInt(row.count, 10),
-            archivedCount: parseInt(row.archived_count, 10),
-            createdCount: parseInt(row.created_count, 10),
-            archivedWeight: parseFloat(row.archived_weight),
-            createdWeight: parseFloat(row.created_weight),
-            amount: 0,
-            couponAmount: 0,
-            round: typeof row.round === 'number' ? row.round : parseInt(row.round, 10),
-        }));
-    }
-    async getUniqueMarkerBeneficiaryParties() {
-        const query = `
-      SELECT DISTINCT
-        beneficiary_party_id as party_id,
-        beneficiary_party_id as display_name
-      FROM canton_app_markers
-      WHERE beneficiary_party_id IS NOT NULL
-      ORDER BY beneficiary_party_id ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
-    }
-    async getMonthlyPaymentTotalForParty(partyId, monthStart, monthEnd) {
-        // Check for transfers using created_at since tx_record_time might be null
-        const query = `
-      SELECT COALESCE(SUM(transfer_amount), 0) as total_amount
-      FROM canton_transfers
-      WHERE transfer_sender_party_id = $1
-      AND created_at >= $2
-      AND created_at <= $3
-      AND status = $4
-    `;
-        const result = await this.pool.query(query, [
-            partyId,
-            monthStart,
-            monthEnd,
-            types_1.TransferStatus.CONFIRMED,
-        ]);
-        return parseFloat(result.rows[0].total_amount);
-    }
-    getRemainingRoundsInMonth(roundDurationMinutes = 10) {
-        if (roundDurationMinutes <= 0) {
-            throw new Error('roundDurationMinutes must be greater than 0');
-        }
-        const now = new Date();
-        const nextMonth = new Date(now.getFullYear(), now.getMonth() + 1, 1);
-        const monthEnd = new Date(nextMonth.getTime() - 1); // Last moment of current month
-        // Calculate how many intervals are remaining in the current month
-        const roundDurationInMs = roundDurationMinutes * 60 * 1000;
-        const remainingTimeInMs = monthEnd.getTime() - now.getTime();
-        const remainingRounds = Math.max(0, Math.floor(remainingTimeInMs / roundDurationInMs));
-        return remainingRounds;
-    }
-    async getMonthlyPaymentTotalsForParties(partyIds, monthStart, monthEnd) {
-        if (partyIds.length === 0) {
-            return new Map();
-        }
-        // Create placeholders for the IN clause
-        const placeholders = partyIds.map((_, index) => `$${index + 4}`).join(',');
-        const query = `
-      SELECT transfer_sender_party_id, COALESCE(SUM(transfer_amount), 0) as total_amount
-      FROM canton_transfers
-      WHERE transfer_sender_party_id IN (${placeholders})
-      AND created_at >= $1
-      AND created_at <= $2
-      AND status = $3
-      GROUP BY transfer_sender_party_id
-    `;
-        const params = [
-            monthStart,
-            monthEnd,
-            types_1.TransferStatus.CONFIRMED,
-            ...partyIds,
-        ];
-        const result = await this.pool.query(query, params);
-        const totals = new Map();
-        result.rows.forEach(row => {
-            totals.set(row.transfer_sender_party_id, parseFloat(row.total_amount));
-        });
-        // Ensure all party IDs are in the map (with 0 if no transfers found)
-        partyIds.forEach(partyId => {
-            if (!totals.has(partyId)) {
-                totals.set(partyId, 0);
-            }
-        });
-        return totals;
-    }
-    async getLifetimePaymentStatisticsForParties(partyIds) {
-        if (partyIds.length === 0) {
-            return new Map();
-        }
-        // Create placeholders for the IN clause
-        const placeholders = partyIds.map((_, index) => `$${index + 1}`).join(',');
-        const query = `
-      SELECT
-        transfer_sender_party_id,
-        COUNT(*) as payment_count,
-        COALESCE(SUM(transfer_amount), 0) as total_value_sent
-      FROM canton_transfers
-      WHERE transfer_sender_party_id IN (${placeholders})
-      AND status = $${partyIds.length + 1}
-      GROUP BY transfer_sender_party_id
-    `;
-        const params = [...partyIds, types_1.TransferStatus.CONFIRMED];
-        const result = await this.pool.query(query, params);
-        const statistics = new Map();
-        result.rows.forEach(row => {
-            const paymentCount = parseInt(row.payment_count, 10);
-            const totalValueSent = parseFloat(row.total_value_sent);
-            const totalFeesPaid = paymentCount * 0.6; // 0.6 * count as specified
-            statistics.set(row.transfer_sender_party_id, {
-                paymentCount,
-                totalValueSent,
-                totalFeesPaid,
-            });
-        });
-        // Ensure all party IDs are in the map (with 0 if no transfers found)
-        partyIds.forEach(partyId => {
-            if (!statistics.has(partyId)) {
-                statistics.set(partyId, {
-                    paymentCount: 0,
-                    totalValueSent: 0,
-                    totalFeesPaid: 0,
-                });
-            }
-        });
-        return statistics;
+        return this.rewardCoupons.getUniqueCouponBeneficiaryParties();
     }
-    /**
-     * Get portals that have enable_canton_rewards=true but don't have canton parties yet
-     *
-     * @returns Array of portal info that need canton parties created
-     */
-    async getPortalsNeedingCantonParties() {
-        const query = `
-      SELECT p.id, p.company->>'name' as company_name
-      FROM portal p
-      WHERE p.enable_canton_rewards = true
-      AND NOT EXISTS (
-        SELECT 1 FROM canton_parties cp
-        WHERE cp.portal_id = p.id
-      )
-      ORDER BY p.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            id: row.id,
-            companyName: row.company_name ?? undefined,
-        }));
-    }
-    // Transaction helper - runs a callback within a database transaction
-    async runInTransaction(callback) {
-        const client = await this.pool.connect();
-        try {
-            await client.query('BEGIN');
-            const result = await callback(client);
-            await client.query('COMMIT');
-            return result;
-        }
-        catch (error) {
-            await client.query('ROLLBACK');
-            throw error;
-        }
-        finally {
-            client.release();
-        }
+    async getHistoricalIssuanceRates(roundNumbers) {
+        return this.rewardCoupons.getHistoricalIssuanceRates(roundNumbers);
     }
-    // Canton App Markers CRUD operations
+    // ========================================================================
+    // App Marker Operations
+    // ========================================================================
     async insertCantonAppMarker(marker) {
-        const query = `
-      INSERT INTO canton_app_markers (
-        status, contract_id, provider_party_id, beneficiary_party_id, tx_record_time, weight
-      ) VALUES ($1, $2, $3, $4, $5, $6)
-      RETURNING *
-    `;
-        const values = [
-            marker.status,
-            marker.contract_id,
-            marker.provider_party_id,
-            marker.beneficiary_party_id,
-            marker.tx_record_time,
-            marker.weight,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapAppMarkerFromDb(result.rows[0]);
+        return this.appMarkers.insertCantonAppMarker(marker);
     }
     async batchInsertCantonAppMarkers(markers) {
-        if (markers.length === 0) {
-            return { insertedCount: 0, skippedCount: 0 };
-        }
-        // Build the VALUES clause with placeholders
-        const valuesPlaceholders = markers
-            .map((_, idx) => `($${idx * 6 + 1}, $${idx * 6 + 2}, $${idx * 6 + 3}, $${idx * 6 + 4}, $${idx * 6 + 5}, $${idx * 6 + 6})`)
-            .join(', ');
-        const query = `
-      INSERT INTO canton_app_markers (
-        status, contract_id, provider_party_id, beneficiary_party_id, tx_record_time, weight
-      ) VALUES ${valuesPlaceholders}
-      ON CONFLICT (contract_id) DO NOTHING
-      RETURNING *
-    `;
-        // Flatten all marker values into a single array
-        const values = markers.flatMap(marker => [
-            marker.status,
-            marker.contract_id,
-            marker.provider_party_id,
-            marker.beneficiary_party_id,
-            marker.tx_record_time,
-            marker.weight,
-        ]);
-        const result = await this.pool.query(query, values);
-        const insertedCount = result.rowCount ?? 0;
-        const skippedCount = markers.length - insertedCount;
-        return { insertedCount, skippedCount };
+        return this.appMarkers.batchInsertCantonAppMarkers(markers);
     }
     async upsertCantonAppMarkerAsArchived(marker) {
-        const query = `
-      INSERT INTO canton_app_markers (
-        status, contract_id, provider_party_id, beneficiary_party_id, tx_record_time, weight
-      ) VALUES ($1, $2, $3, $4, $5, $6)
-      ON CONFLICT (contract_id) DO UPDATE
-      SET status = EXCLUDED.status, updated_at = NOW()
-      RETURNING *
-    `;
-        const values = [
-            marker.status,
-            marker.contract_id,
-            marker.provider_party_id,
-            marker.beneficiary_party_id,
-            marker.tx_record_time,
-            marker.weight,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapAppMarkerFromDb(result.rows[0]);
+        return this.appMarkers.upsertCantonAppMarkerAsArchived(marker);
     }
     async getCantonAppMarker(id) {
-        const query = 'SELECT * FROM canton_app_markers WHERE id = $1';
-        const result = await this.pool.query(query, [id]);
-        return result.rows.length > 0
-            ? this.mapAppMarkerFromDb(result.rows[0])
-            : null;
+        return this.appMarkers.getCantonAppMarker(id);
     }
     async getCantonAppMarkerByContractId(contractId) {
-        const query = 'SELECT * FROM canton_app_markers WHERE contract_id = $1';
-        const result = await this.pool.query(query, [contractId]);
-        return result.rows.length > 0
-            ? this.mapAppMarkerFromDb(result.rows[0])
-            : null;
+        return this.appMarkers.getCantonAppMarkerByContractId(contractId);
     }
     async getCantonAppMarkersByContractIds(contractIds) {
-        if (contractIds.length === 0) {
-            return [];
-        }
-        const placeholders = contractIds
-            .map((_, index) => `$${index + 1}`)
-            .join(', ');
-        const query = `
-      SELECT * FROM canton_app_markers
-      WHERE contract_id IN (${placeholders})
-    `;
-        const result = await this.pool.query(query, contractIds);
-        return result.rows.map(row => this.mapAppMarkerFromDb(row));
+        return this.appMarkers.getCantonAppMarkersByContractIds(contractIds);
     }
     async batchUpdateCantonAppMarkersByContractIds(contractIds, updates) {
-        if (contractIds.length === 0) {
-            return [];
-        }
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        // Build the WHERE clause for contract IDs
-        const contractIdPlaceholders = contractIds
-            .map((_, index) => `$${paramIndex + index}`)
-            .join(', ');
-        values.push(...contractIds);
-        const query = `
-      UPDATE canton_app_markers
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE contract_id IN (${contractIdPlaceholders})
-      RETURNING *
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.map(row => this.mapAppMarkerFromDb(row));
+        return this.appMarkers.batchUpdateCantonAppMarkersByContractIds(contractIds, updates);
     }
     async getCantonAppMarkersByStatus(status, limit = 100, sortOrder = 'ASC') {
-        const query = `
-      SELECT * FROM canton_app_markers
-      WHERE status = $1
-      ORDER BY tx_record_time ${sortOrder}
-      LIMIT $2
-    `;
-        const result = await this.pool.query(query, [status, limit]);
-        return result.rows.map(row => this.mapAppMarkerFromDb(row));
+        return this.appMarkers.getCantonAppMarkersByStatus(status, limit, sortOrder);
     }
     async getLatestCantonAppMarkers(limit = 3, beneficiaryPartyId) {
-        let query = `
-      SELECT * FROM canton_app_markers
-    `;
-        const params = [];
-        if (beneficiaryPartyId) {
-            query += ` WHERE beneficiary_party_id = $1`;
-            params.push(beneficiaryPartyId);
-        }
-        query += ` ORDER BY tx_record_time DESC LIMIT $${params.length + 1}`;
-        params.push(limit);
-        const result = await this.pool.query(query, params);
-        return result.rows.map(row => this.mapAppMarkerFromDb(row));
+        return this.appMarkers.getLatestCantonAppMarkers(limit, beneficiaryPartyId);
     }
     async getOldestUnarchivedCantonAppMarkers(limit = 3, beneficiaryPartyId) {
-        let query = `
-      SELECT * FROM canton_app_markers
-      WHERE status = 'created'
-    `;
-        const params = [];
-        if (beneficiaryPartyId) {
-            query += ` AND beneficiary_party_id = $${params.length + 1}`;
-            params.push(beneficiaryPartyId);
-        }
-        query += ` ORDER BY tx_record_time ASC LIMIT $${params.length + 1}`;
-        params.push(limit);
-        const result = await this.pool.query(query, params);
-        return result.rows.map(row => this.mapAppMarkerFromDb(row));
+        return this.appMarkers.getOldestUnarchivedCantonAppMarkers(limit, beneficiaryPartyId);
     }
     async updateCantonAppMarker(id, updates) {
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        values.push(id);
-        const query = `
-      UPDATE canton_app_markers
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE id = $${paramIndex}
-      RETURNING *
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.length > 0
-            ? this.mapAppMarkerFromDb(result.rows[0])
-            : null;
-    }
-    // Canton Parties CRUD operations
+        return this.appMarkers.updateCantonAppMarker(id, updates);
+    }
+    async getUniqueMarkerBeneficiaryParties() {
+        return this.appMarkers.getUniqueMarkerBeneficiaryParties();
+    }
+    // ========================================================================
+    // Party Operations
+    // ========================================================================
     async insertCantonParty(party) {
-        const query = `
-      INSERT INTO canton_parties (
-        party_id, portal_id, provider, last_payment_until, is_active_customer_since
-      ) VALUES ($1, $2, $3, $4, $5)
-      RETURNING *
-    `;
-        const values = [
-            party.party_id,
-            party.portal_id,
-            party.provider,
-            party.last_payment_until,
-            party.is_active_customer_since,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapPartyFromDb(result.rows[0]);
+        return this.parties.insertCantonParty(party);
     }
     async getCantonParty(id) {
-        const query = `
-      SELECT
-        cp.*,
-        p.company
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      WHERE cp.id = $1
-    `;
-        const result = await this.pool.query(query, [id]);
-        return result.rows.length > 0 ? this.mapPartyFromDb(result.rows[0]) : null;
+        return this.parties.getCantonParty(id);
     }
     async getCantonPartyByPartyId(partyId) {
-        const query = `
-      SELECT
-        cp.*,
-        p.company
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      WHERE cp.party_id = $1
-    `;
-        const result = await this.pool.query(query, [partyId]);
-        return result.rows.length > 0 ? this.mapPartyFromDb(result.rows[0]) : null;
+        return this.parties.getCantonPartyByPartyId(partyId);
     }
     async updateCantonParty(id, updates) {
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query - exclude amulets field
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at' && key !== 'amulets') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        values.push(id);
-        const query = `
-      UPDATE canton_parties
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE id = $${paramIndex}
-      RETURNING id
-    `;
-        const result = await this.pool.query(query, values);
-        if (result.rows.length > 0) {
-            return this.getCantonParty(id);
-        }
-        return null;
+        return this.parties.updateCantonParty(id, updates);
     }
     async updateCantonPartyByPartyId(partyId, updates) {
-        const setClauses = [];
-        const values = [];
-        let paramIndex = 1;
-        // Build dynamic update query - exclude amulets field
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key !== 'id' && key !== 'created_at' && key !== 'amulets') {
-                setClauses.push(`${this.toSnakeCase(key)} = $${paramIndex}`);
-                values.push(value);
-                paramIndex++;
-            }
-        });
-        if (setClauses.length === 0) {
-            throw new Error('No valid fields to update');
-        }
-        values.push(partyId);
-        const query = `
-      UPDATE canton_parties
-      SET ${setClauses.join(', ')}, updated_at = NOW()
-      WHERE party_id = $${paramIndex}
-      RETURNING party_id
-    `;
-        const result = await this.pool.query(query, values);
-        if (result.rows.length > 0) {
-            return this.getCantonPartyByPartyId(partyId);
-        }
-        return null;
+        return this.parties.updateCantonPartyByPartyId(partyId, updates);
     }
-    // Amulet operations removed - use getActiveContracts instead
-    // async addAmuletToParty() - REMOVED
-    // async removeAmuletFromParty() - REMOVED
-    // async replaceAmuletsForParty() - REMOVED
     async getActiveCustomersWithExpiredPayment() {
-        const query = `
-      SELECT
-        cp.*,
-        p.company
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      WHERE cp.is_active_customer_since IS NOT NULL
-      AND (cp.last_payment_until IS NULL OR cp.last_payment_until < NOW())
-      ORDER BY cp.last_payment_until ASC NULLS FIRST
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => this.mapPartyFromDb(row));
+        return this.parties.getActiveCustomersWithExpiredPayment();
     }
     async getAllParties(provider) {
-        let query = `
-      SELECT
-        cp.*,
-        p.company
-      FROM canton_parties cp
-      INNER JOIN portal p ON cp.portal_id = p.id
-    `;
-        const values = [];
-        if (provider) {
-            // Handle 5n-broker case since database enum doesn't support it yet
-            if (provider === '5n-broker') {
-                // For now, return empty array since 5n-broker parties aren't in the database yet
-                console.log('⚠️ 5n-broker provider requested - returning empty array (not in database yet)');
-                return [];
-            }
-            query += ` WHERE cp.provider = $1`;
-            values.push(provider);
-        }
-        query += ` ORDER BY cp.created_at ASC`;
-        console.log(`🔍 Database query for network=${this.network}, provider=${provider}:`, { query, values });
-        const result = await this.pool.query(query, values);
-        console.log(`📋 Database returned ${result.rows.length} parties for network=${this.network}, provider=${provider}`);
-        if (result.rows.length > 0) {
-            console.log('📝 Sample database parties:', result.rows
-                .slice(0, 3)
-                .map(row => ({ party_id: row.party_id, provider: row.provider })));
-        }
-        const parties = result.rows.map(row => this.mapPartyFromDb(row));
-        // Get payment statistics for all parties
-        const partyIds = parties.map(party => party.party_id);
-        const paymentStats = await this.getLifetimePaymentStatisticsForParties(partyIds);
-        // Merge payment statistics with party data
-        return parties.map(party => {
-            const stats = paymentStats.get(party.party_id);
-            return {
-                ...party,
-                payment_count: stats?.paymentCount ?? 0,
-                total_value_sent: stats?.totalValueSent ?? 0,
-                total_fees_paid: stats?.totalFeesPaid ?? 0,
-            };
-        });
-    }
-    // OCF Deployments CRUD operations
+        return this.parties.getAllParties(provider);
+    }
+    async getPortalsNeedingCantonParties() {
+        return this.parties.getPortalsNeedingCantonParties();
+    }
+    // ========================================================================
+    // Time Series Operations
+    // ========================================================================
+    async getTransferTimeSeriesData(timeRange, metric = 'count', timePeriod, customStartDate) {
+        return this.timeSeries.getTransferTimeSeriesData(timeRange, metric, timePeriod, customStartDate);
+    }
+    async getRewardCouponTimeSeriesData(timeRange, metric = 'count', timePeriod, customStartDate, partyFilter, couponStatus = 'all') {
+        return this.timeSeries.getRewardCouponTimeSeriesData(timeRange, metric, timePeriod, customStartDate, partyFilter, couponStatus);
+    }
+    async getRewardCouponRoundSeriesData(timeRange, metric = 'count', timePeriod, customStartDate, partyFilter, couponStatus = 'all') {
+        return this.timeSeries.getRewardCouponRoundSeriesData(timeRange, metric, timePeriod, customStartDate, partyFilter, couponStatus);
+    }
+    async getAppMarkerTimeSeriesData(timeRange, metric = 'count', timePeriod, customStartDate, partyFilter, statusFilter) {
+        return this.timeSeries.getAppMarkerTimeSeriesData(timeRange, metric, timePeriod, customStartDate, partyFilter, statusFilter);
+    }
+    async getAppMarkerRoundSeriesData(timeRange, metric = 'count', timePeriod, customStartDate, partyFilter, statusFilter) {
+        return this.timeSeries.getAppMarkerRoundSeriesData(timeRange, metric, timePeriod, customStartDate, partyFilter, statusFilter);
+    }
+    async getMonthlyTransferTotal(monthStart, monthEnd) {
+        return this.timeSeries.getMonthlyTransferTotal(monthStart, monthEnd);
+    }
+    // ========================================================================
+    // OCF Deployment Operations
+    // ========================================================================
     async insertOcfDeployment(deployment) {
-        const query = `
-      INSERT INTO ocf_deployments (
-        ocf_object_id, version, chain_id, status, tx_hash, contract_id, party_id, wallet_address
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-      RETURNING id, ocf_object_id, version, chain_id, status, tx_hash, contract_id, party_id, wallet_address, created_at, updated_at
-    `;
-        const values = [
-            deployment.ocf_object_id,
-            deployment.version,
-            deployment.chain_id,
-            deployment.status,
-            deployment.tx_hash,
-            deployment.contract_id,
-            deployment.party_id,
-            deployment.wallet_address,
-        ];
-        const result = await this.pool.query(query, values);
-        const row = result.rows[0];
-        return {
-            id: row.id,
-            ocf_object_id: row.ocf_object_id,
-            version: row.version,
-            chain_id: row.chain_id,
-            status: row.status,
-            tx_hash: row.tx_hash,
-            contract_id: row.contract_id,
-            party_id: row.party_id,
-            wallet_address: row.wallet_address,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
+        return this.ocfDeployments.insertOcfDeployment(deployment);
     }
     async getLatestOcfDeploymentByPartyId(partyId) {
-        const query = `
-      SELECT id, ocf_object_id, version, chain_id, status, tx_hash, contract_id, party_id, wallet_address, created_at, updated_at
-      FROM ocf_deployments
-      WHERE party_id = $1
-      ORDER BY version DESC
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query, [partyId]);
-        if (result.rows.length === 0) {
-            return null;
-        }
-        const row = result.rows[0];
-        return {
-            id: row.id,
-            ocf_object_id: row.ocf_object_id,
-            version: row.version,
-            chain_id: row.chain_id,
-            status: row.status,
-            tx_hash: row.tx_hash,
-            contract_id: row.contract_id,
-            party_id: row.party_id,
-            wallet_address: row.wallet_address,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
+        return this.ocfDeployments.getLatestOcfDeploymentByPartyId(partyId);
     }
     async getLatestOcfObjectByPortalId(portalId) {
-        const query = `
-      SELECT o.id as ocf_object_id, o.version
-      FROM latest_ocf_objects o
-      WHERE o.portal_id = $1
-      AND o.type = 'ISSUER'
-      ORDER BY o.version DESC
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query, [portalId]);
-        if (result.rows.length === 0) {
-            return null;
-        }
-        const row = result.rows[0];
-        return {
-            ocf_object_id: row.ocf_object_id,
-            version: row.version,
-        };
+        return this.ocfDeployments.getLatestOcfObjectByPortalId(portalId);
     }
-    /** Retrieve a specific OCF object row by id and version */
     async getOcfObjectDataByIdAndVersion(ocfObjectId, version) {
-        const query = `
-      SELECT type, subtype, ocf_data
-      FROM ocf_objects
-      WHERE id = $1 AND version = $2
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query, [ocfObjectId, version]);
-        if (result.rows.length === 0)
-            return null;
-        const row = result.rows[0];
-        return {
-            type: row.type,
-            subtype: row.subtype ?? null,
-            ocf_data: row.ocf_data,
-        };
-    }
-    /** List OCF deployments, optionally filtered */
+        return this.ocfDeployments.getOcfObjectDataByIdAndVersion(ocfObjectId, version);
+    }
     async listOcfDeployments(params) {
-        const conditions = [];
-        const values = [];
-        let idx = 1;
-        if (params?.chainId) {
-            conditions.push(`chain_id = $${idx++}`);
-            values.push(params.chainId);
-        }
-        if (params?.status) {
-            conditions.push(`status = $${idx++}`);
-            values.push(params.status);
-        }
-        if (params?.partyId) {
-            conditions.push(`party_id = $${idx++}`);
-            values.push(params.partyId);
-        }
-        const whereClause = conditions.length
-            ? `WHERE ${conditions.join(' AND ')}`
-            : '';
-        const limitClause = typeof params?.limit === 'number' ? `LIMIT ${params.limit}` : '';
-        const offsetClause = typeof params?.offset === 'number' ? `OFFSET ${params.offset}` : '';
-        const query = `
-      SELECT id, ocf_object_id, version, chain_id, status, tx_hash, contract_id, party_id, wallet_address, created_at, updated_at
-      FROM ocf_deployments
-      ${whereClause}
-      ORDER BY created_at DESC
-      ${limitClause}
-      ${offsetClause}
-    `;
-        const result = await this.pool.query(query, values);
-        return result.rows.map(row => ({
-            id: row.id,
-            ocf_object_id: row.ocf_object_id,
-            version: row.version,
-            chain_id: row.chain_id,
-            status: row.status,
-            tx_hash: row.tx_hash,
-            contract_id: row.contract_id,
-            party_id: row.party_id,
-            wallet_address: row.wallet_address,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        }));
-    }
-    /** Count total rows in latest_ocf_objects for progress stats */
+        return this.ocfDeployments.listOcfDeployments(params);
+    }
     async countLatestOcfObjects() {
-        const query = `SELECT COUNT(*) AS cnt FROM latest_ocf_objects`;
-        const result = await this.pool.query(query);
-        return Number(result.rows[0]?.cnt ?? 0);
+        return this.ocfDeployments.countLatestOcfObjects();
     }
-    /**
-     * Count rows in latest_ocf_objects that belong to portals with sync_captable_onchain=true Used for actionable
-     * progress stats (objects that should be synced onchain)
-     */
     async countLatestOcfObjectsForOnchainSync() {
-        const query = `
-      SELECT COUNT(*) AS cnt
-      FROM latest_ocf_objects o
-      JOIN portal p ON p.id = o.portal_id
-      WHERE p.enable_canton_rewards = true
-    `;
-        const result = await this.pool.query(query);
-        return Number(result.rows[0]?.cnt ?? 0);
+        return this.ocfDeployments.countLatestOcfObjectsForOnchainSync();
     }
     async getLatestOcfObjectDataByPortalId(portalId) {
-        const query = `
-      SELECT o.id as ocf_object_id, o.version, o.ocf_data, o.type
-      FROM latest_ocf_objects o
-      WHERE o.portal_id = $1
-      AND o.type = 'ISSUER'
-      ORDER BY o.version DESC
-      LIMIT 1
-      `;
-        const result = await this.pool.query(query, [portalId]);
-        if (result.rows.length === 0) {
-            return null;
-        }
-        const row = result.rows[0];
-        return {
-            ocf_object_id: row.ocf_object_id,
-            version: row.version,
-            ocf_data: row.ocf_data,
-            type: row.type,
-        };
+        return this.ocfDeployments.getLatestOcfObjectDataByPortalId(portalId);
     }
     async getPartiesWithoutOcfObjects() {
-        const query = `
-      SELECT
-        cp.party_id,
-        cp.portal_id,
-        cp.provider,
-        p.company
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      WHERE NOT EXISTS (
-        SELECT 1 FROM latest_ocf_objects o
-        WHERE o.portal_id = cp.portal_id
-        AND o.type = 'ISSUER'
-      )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPartiesWithoutOcfObjects();
     }
     async getPartiesWithOcfObjectsButNoIssuerDeployments() {
-        const query = `
-      SELECT
-        cp.party_id,
-        cp.portal_id,
-        cp.provider,
-        p.company,
-        o.id as ocf_object_id,
-        o.version as ocf_version,
-        o.ocf_data,
-        o.type as ocf_type
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      INNER JOIN latest_ocf_objects o ON o.portal_id = cp.portal_id AND o.type = 'ISSUER'
-      WHERE NOT EXISTS (
-        SELECT 1 FROM ocf_deployments od
-        WHERE od.party_id = cp.party_id
-        AND od.ocf_object_id = o.id
-      )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPartiesWithOcfObjectsButNoIssuerDeployments();
     }
     async getPartiesWithOutdatedIssuerDeployments() {
-        const query = `
-      SELECT
-        cp.party_id,
-        cp.portal_id,
-        cp.provider,
-        p.company,
-        latest_ocf.version as latest_ocf_version,
-        latest_deployment.version as deployed_version,
-        latest_ocf.id as latest_ocf_object_id,
-        latest_deployment.contract_id as current_contract_id,
-        latest_ocf.ocf_data,
-        latest_ocf.type as ocf_type
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      INNER JOIN (
-        SELECT o.portal_id, o.id, o.version, o.ocf_data, o.type
-        FROM latest_ocf_objects o
-        WHERE o.type = 'ISSUER'
-      ) latest_ocf ON latest_ocf.portal_id = cp.portal_id
-      INNER JOIN (
-        SELECT od.party_id, od.ocf_object_id, od.version, od.contract_id,
-               ROW_NUMBER() OVER (PARTITION BY od.party_id ORDER BY od.version DESC) as rn
-        FROM ocf_deployments od
-        WHERE od.status = 'deployed'
-      ) latest_deployment ON latest_deployment.party_id = cp.party_id
-                          AND latest_deployment.rn = 1
-      WHERE latest_ocf.version > latest_deployment.version
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPartiesWithOutdatedIssuerDeployments();
     }
     async getOnchainEquityValuations() {
-        const query = `
-      SELECT p.id AS portal_id,
-             p.id AS company_id,
-             p.company->>'name' AS company_name,
-             CASE
-               WHEN COALESCE((pp.company_data ->> 'company_custom_valuation')::numeric, 0) > COALESCE((pp.company_data ->> 'company_computed_valuation')::numeric, 0)
-                 THEN COALESCE((pp.company_data ->> 'company_custom_valuation')::numeric, 0)
-               ELSE COALESCE((pp.company_data ->> 'company_computed_valuation')::numeric, 0)
-             END AS company_valuation
-      FROM portal p
-      JOIN portal_private pp ON pp.portal_id = p.id
-      WHERE (p.company ->> 'name') !~* 'Fairbnb'
-        AND (
-          p.captable_minted
-          OR (
-            p.domain !~* 'staging'
-            AND p.domain !~* 'websitecf'
-            AND p.domain !~* '.cafe'
-          )
-        )
-      ORDER BY p.captable_minted,
-               CASE
-                 WHEN COALESCE((pp.company_data ->> 'company_custom_valuation')::numeric, 0) > COALESCE((pp.company_data ->> 'company_computed_valuation')::numeric, 0)
-                   THEN COALESCE((pp.company_data ->> 'company_custom_valuation')::numeric, 0)
-                 ELSE COALESCE((pp.company_data ->> 'company_computed_valuation')::numeric, 0)
-               END DESC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => ({
-            portal_id: row.portal_id,
-            company_id: row.company_id,
-            company_name: row.company_name ?? null,
-            company_valuation: Number(row.company_valuation ?? 0),
-        }));
+        return this.ocfDeployments.getOnchainEquityValuations();
     }
     async getPortalsNeedingStockClassDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        loo.type = 'STOCK_CLASS'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od_sc
-          WHERE od_sc.ocf_object_id = loo.id
-            AND od_sc.party_id = cp.party_id
-            AND od_sc.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockClassDeployments();
     }
     async getPortalsNeedingStockClassUpdates() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version as latest_ocf_version,
-        od.version as deployed_version,
-        od.contract_id as current_contract_id,
-        (loo.version - od.version) AS version_diff,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      JOIN ocf_deployments od ON loo.id = od.ocf_object_id AND cp.party_id = od.party_id
-      WHERE
-        loo.type = 'STOCK_CLASS'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND od.version < loo.version
-        AND od.status = 'deployed'
-      ORDER BY version_diff DESC, cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockClassUpdates();
     }
     async getPortalsNeedingStakeholderDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        loo.type = 'STAKEHOLDER'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od_sh
-          WHERE od_sh.ocf_object_id = loo.id
-            AND od_sh.party_id = cp.party_id
-            AND od_sh.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStakeholderDeployments();
     }
     async getPortalsNeedingStakeholderReDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version as latest_ocf_version,
-        od.version as deployed_version,
-        od.contract_id as current_contract_id,
-        (loo.version - od.version) AS version_diff,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      JOIN ocf_deployments od ON loo.id = od.ocf_object_id AND cp.party_id = od.party_id
-      WHERE
-        loo.type = 'STAKEHOLDER'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND od.version < loo.version
-        AND od.status = 'deployed'
-      ORDER BY version_diff DESC, cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStakeholderReDeployments();
     }
     async getPortalsNeedingStockPlanDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        loo.type = 'STOCK_PLAN'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od_sp
-          WHERE od_sp.ocf_object_id = loo.id
-            AND od_sp.party_id = cp.party_id
-            AND od_sp.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockPlanDeployments();
     }
     async getPortalsNeedingStockPlanReDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version as latest_ocf_version,
-        od.version as deployed_version,
-        od.contract_id as current_contract_id,
-        (loo.version - od.version) AS version_diff,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      JOIN ocf_deployments od ON loo.id = od.ocf_object_id AND cp.party_id = od.party_id
-      WHERE
-        loo.type = 'STOCK_PLAN'
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND od.version < loo.version
-        AND od.status = 'deployed'
-      ORDER BY version_diff DESC, cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockPlanReDeployments();
     }
     async getPortalsNeedingStockLegendTemplateDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'OBJECT' AND loo.subtype = 'STOCK_LEGEND_TEMPLATE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockLegendTemplateDeployments();
     }
     async getPortalsNeedingDocumentDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'OBJECT' AND loo.subtype = 'DOCUMENT')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingDocumentDeployments();
     }
     async getPortalsNeedingVestingTermsDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'OBJECT' AND loo.subtype = 'VESTING_TERMS')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingVestingTermsDeployments();
     }
     async getPortalsNeedingStockIssuanceDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_STOCK_ISSUANCE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockIssuanceDeployments();
     }
     async getPortalsNeedingWarrantIssuanceDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_WARRANT_ISSUANCE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingWarrantIssuanceDeployments();
     }
     async getPortalsNeedingStockPlanPoolAdjustmentDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_STOCK_PLAN_POOL_ADJUSTMENT')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockPlanPoolAdjustmentDeployments();
     }
     async getPortalsNeedingStockClassAuthorizedSharesAdjustmentDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_STOCK_CLASS_AUTHORIZED_SHARES_ADJUSTMENT')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockClassAuthorizedSharesAdjustmentDeployments();
     }
     async getPortalsNeedingStockCancellationDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_STOCK_CANCELLATION')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingStockCancellationDeployments();
     }
     async getPortalsNeedingIssuerAuthorizedSharesAdjustmentDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_ISSUER_AUTHORIZED_SHARES_ADJUSTMENT')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingIssuerAuthorizedSharesAdjustmentDeployments();
     }
     async getPortalsNeedingEquityCompensationIssuanceDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_EQUITY_COMPENSATION_ISSUANCE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingEquityCompensationIssuanceDeployments();
     }
     async getPortalsNeedingEquityCompensationExerciseDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_EQUITY_COMPENSATION_EXERCISE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingEquityCompensationExerciseDeployments();
     }
     async getPortalsNeedingConvertibleIssuanceDeployments() {
-        const query = `
-      SELECT DISTINCT
-        cp.portal_id,
-        cp.party_id,
-        cp.provider,
-        cp.created_at,
-        p.company,
-        loo.ocf_data,
-        loo.id AS ocf_object_id,
-        loo.version AS ocf_version,
-        (
-          SELECT od_issuer.contract_id
-          FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-          ORDER BY od_issuer.created_at DESC
-          LIMIT 1
-        ) as issuer_contract_id
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-      WHERE
-        (loo.type = 'TRANSACTION' AND loo.subtype = 'TX_CONVERTIBLE_ISSUANCE')
-        AND EXISTS (
-          SELECT 1 FROM ocf_deployments od_issuer
-          JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-          WHERE od_issuer.party_id = cp.party_id
-            AND od_issuer.status = 'deployed'
-            AND loo_issuer.type = 'ISSUER'
-        )
-        AND NOT EXISTS (
-          SELECT 1 FROM ocf_deployments od
-          WHERE od.ocf_object_id = loo.id
-            AND od.party_id = cp.party_id
-            AND od.status = 'deployed'
-        )
-      ORDER BY cp.created_at ASC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows;
+        return this.ocfDeployments.getPortalsNeedingConvertibleIssuanceDeployments();
     }
-    /**
-     * Returns the next party_id that has any pending OCF work (missing deployments or updates), ordered by the associated
-     * party creation time.
-     */
     async getNextPartyIdWithPendingOcfWork() {
-        const query = `
-      WITH eligible_party AS (
-        SELECT DISTINCT cp.party_id, cp.created_at
-        FROM canton_parties cp
-        JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-        WHERE
-          -- Issuer must be deployed for this party
-          EXISTS (
-            SELECT 1 FROM ocf_deployments od_issuer
-            JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-            WHERE od_issuer.party_id = cp.party_id
-              AND od_issuer.status = 'deployed'
-              AND loo_issuer.type = 'ISSUER'
-          )
-          AND (
-            -- Missing for any object/transaction/record type (excluding ISSUER)
-            (loo.type <> 'ISSUER' AND NOT EXISTS (
-              SELECT 1 FROM ocf_deployments od
-              WHERE od.ocf_object_id = loo.id
-                AND od.party_id = cp.party_id
-                AND od.status = 'deployed'
-            ))
-            OR
-            -- Updates for any type/subtype except ISSUER
-            (
-              loo.type <> 'ISSUER'
-              AND EXISTS (
-                SELECT 1 FROM ocf_deployments od2
-                WHERE od2.ocf_object_id = loo.id
-                  AND od2.party_id = cp.party_id
-                  AND od2.status = 'deployed'
-                  AND od2.version < loo.version
-              )
-            )
-          )
-      )
-      SELECT party_id
-      FROM eligible_party
-      ORDER BY created_at ASC
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query);
-        if (result.rows.length === 0)
-            return null;
-        return result.rows[0].party_id;
+        return this.ocfDeployments.getNextPartyIdWithPendingOcfWork();
+    }
+    async getPendingOcfItemsForParty(partyId) {
+        return this.ocfDeployments.getPendingOcfItemsForParty(partyId);
+    }
+    // Cap Table Replication
+    async getAllIssuersToReplicate() {
+        return this.ocfDeployments.getAllIssuersToReplicate();
     }
     /**
-     * Returns all pending OCF items (missing or updates) for a given party in a single query. This unifies
-     * objects/transactions and core records, and includes metadata needed by the script.
+     * @deprecated Use `getAllIssuersToReplicate` instead.
      */
-    async getPendingOcfItemsForParty(partyId) {
-        const query = `
-      (
-        -- Missing deployments across all OCF types/subtypes
-        SELECT DISTINCT
-          cp.portal_id,
-          cp.party_id,
-          cp.provider,
-          p.company,
-          loo.id AS ocf_object_id,
-          loo.ocf_data,
-          loo.version AS ocf_version,
-          NULL::int AS latest_ocf_version,
-          NULL::int AS deployed_version,
-          NULL::text AS current_contract_id,
-          loo.type AS ocf_type,
-          loo.subtype AS ocf_subtype,
-          (
-            SELECT od_issuer.contract_id
-            FROM ocf_deployments od_issuer
-            JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-            WHERE od_issuer.party_id = cp.party_id
-              AND od_issuer.status = 'deployed'
-              AND loo_issuer.type = 'ISSUER'
-            ORDER BY od_issuer.created_at DESC
-            LIMIT 1
-          ) AS issuer_contract_id,
-          cp.created_at
-        FROM canton_parties cp
-        LEFT JOIN portal p ON cp.portal_id = p.id
-        JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-        WHERE cp.party_id = $1
-          AND EXISTS (
-            SELECT 1 FROM ocf_deployments od_issuer
-            JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-            WHERE od_issuer.party_id = cp.party_id
-              AND od_issuer.status = 'deployed'
-              AND loo_issuer.type = 'ISSUER'
-          )
-          AND NOT EXISTS (
-            SELECT 1 FROM ocf_deployments od
-            WHERE od.ocf_object_id = loo.id
-              AND od.party_id = cp.party_id
-              AND od.status = 'deployed'
-          )
-      )
-      UNION ALL
-      (
-        -- Updates for core record types
-        SELECT DISTINCT
-          cp.portal_id,
-          cp.party_id,
-          cp.provider,
-          p.company,
-          loo.id AS ocf_object_id,
-          loo.ocf_data,
-          NULL::int AS ocf_version,
-          loo.version AS latest_ocf_version,
-          od.version AS deployed_version,
-          od.contract_id AS current_contract_id,
-          loo.type AS ocf_type,
-          loo.subtype AS ocf_subtype,
-          (
-            SELECT od_issuer.contract_id
-            FROM ocf_deployments od_issuer
-            JOIN latest_ocf_objects loo_issuer ON od_issuer.ocf_object_id = loo_issuer.id
-            WHERE od_issuer.party_id = cp.party_id
-              AND od_issuer.status = 'deployed'
-              AND loo_issuer.type = 'ISSUER'
-            ORDER BY od_issuer.created_at DESC
-            LIMIT 1
-          ) AS issuer_contract_id,
-          cp.created_at
-        FROM canton_parties cp
-        LEFT JOIN portal p ON cp.portal_id = p.id
-        JOIN latest_ocf_objects loo ON cp.portal_id = loo.portal_id
-        JOIN ocf_deployments od ON loo.id = od.ocf_object_id AND cp.party_id = od.party_id
-        WHERE cp.party_id = $1
-          AND loo.type <> 'ISSUER'
-          AND od.status = 'deployed'
-          AND od.version < loo.version
-      )
-      ORDER BY created_at ASC
-    `;
-        const result = await this.pool.query(query, [partyId]);
-        return result.rows;
+    async getNextIssuerToReplicate() {
+        return this.ocfDeployments.getNextIssuerToReplicate();
     }
+    async getAllOcfObjectsForIssuer(portalId) {
+        return this.ocfDeployments.getAllOcfObjectsForIssuer(portalId);
+    }
+    // ========================================================================
+    // Valuation Report Operations
+    // ========================================================================
     async getLatestValuationReportByPortalId(portalId) {
-        const query = `
-      SELECT *
-      FROM canton_valuation_reports
-      WHERE portal_id = $1
-      ORDER BY version DESC
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query, [portalId]);
-        if (result.rows.length === 0)
-            return null;
-        return this.mapValuationReportFromDb(result.rows[0]);
-    }
-    /** Get the latest valuation report row for each distinct company_id */
+        return this.valuationReports.getLatestValuationReportByPortalId(portalId);
+    }
     async getLatestValuationReportsGroupedByCompany() {
-        const query = `
-      SELECT DISTINCT ON (company_id)
-        id, portal_id, company_id, version, contract_id, company_valuation,
-        tx_update_id, last_valuation_until, created_at, updated_at
-      FROM canton_valuation_reports
-      ORDER BY company_id, version DESC
-    `;
-        const result = await this.pool.query(query);
-        return result.rows.map(row => this.mapValuationReportFromDb(row));
+        return this.valuationReports.getLatestValuationReportsGroupedByCompany();
     }
     async insertValuationReport(report) {
-        const query = `
-      INSERT INTO canton_valuation_reports (
-        portal_id, company_id, version, contract_id, company_valuation, tx_update_id, last_valuation_until
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7)
-      RETURNING *
-    `;
-        const values = [
-            report.portal_id,
-            report.company_id,
-            report.version,
-            report.contract_id,
-            report.company_valuation,
-            report.tx_update_id,
-            report.last_valuation_until,
-        ];
-        const result = await this.pool.query(query, values);
-        return this.mapValuationReportFromDb(result.rows[0]);
-    }
-    // Helper methods for mapping database results
-    mapTransferFromDb(row) {
-        return {
-            id: row.id,
-            api_tracking_id: row.api_tracking_id,
-            api_expires_at: row.api_expires_at,
-            transfer_sender_party_id: row.transfer_sender_party_id,
-            transfer_receiver_party_id: row.transfer_receiver_party_id,
-            transfer_amount: parseFloat(row.transfer_amount),
-            transfer_description: row.transfer_description,
-            transfer_burned_amount: parseFloat(row.transfer_burned_amount),
-            receiver_holding_cids: row.receiver_holding_cids,
-            sender_change_cids: row.sender_change_cids,
-            tx_update_id: row.tx_update_id,
-            tx_record_time: row.tx_record_time,
-            status: row.status,
-            app_reward_coupon_id: row.app_reward_coupon_id,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
-    }
-    mapRewardCouponFromDb(row) {
-        return {
-            id: row.id,
-            status: row.status,
-            tx_update_id: row.tx_update_id,
-            tx_record_time: row.tx_record_time,
-            contract_id: row.contract_id,
-            template_id: row.template_id,
-            package_name: row.package_name,
-            dso_party_id: row.dso_party_id,
-            provider_party_id: row.provider_party_id,
-            featured: row.featured,
-            round_number: row.round_number,
-            beneficiary_party_id: row.beneficiary_party_id,
-            coupon_amount: parseFloat(row.coupon_amount),
-            tx_archive_update_id: row.tx_archive_update_id,
-            tx_archive_record_time: row.tx_archive_record_time,
-            app_reward_amount: row.app_reward_amount
-                ? parseFloat(row.app_reward_amount)
-                : null,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
-    }
-    mapAppMarkerFromDb(row) {
-        return {
-            id: row.id,
-            status: row.status,
-            contract_id: row.contract_id,
-            provider_party_id: row.provider_party_id,
-            beneficiary_party_id: row.beneficiary_party_id,
-            tx_record_time: row.tx_record_time,
-            weight: parseFloat(row.weight),
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
-    }
-    mapRedemptionFromDb(row) {
-        return {
-            id: row.id,
-            transfer_id: row.transfer_id,
-            app_reward_coupon_ids: row.app_reward_coupon_ids,
-            tx_update_id: row.tx_update_id,
-            tx_record_time: row.tx_record_time,
-            tx_synchronizer_id: row.tx_synchronizer_id,
-            tx_effective_at: row.tx_effective_at,
-            total_app_rewards: parseFloat(row.total_app_rewards),
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
-    }
-    mapRewardCouponWithTransferFromDb(row) {
-        const coupon = {
-            id: row.coupon_id,
-            status: row.coupon_status,
-            tx_update_id: row.coupon_tx_update_id,
-            tx_record_time: row.coupon_tx_record_time,
-            contract_id: row.coupon_contract_id,
-            template_id: row.coupon_template_id,
-            package_name: row.coupon_package_name,
-            dso_party_id: row.coupon_dso_party_id,
-            provider_party_id: row.coupon_provider_party_id,
-            featured: row.coupon_featured,
-            round_number: row.coupon_round_number,
-            beneficiary_party_id: row.coupon_beneficiary_party_id,
-            coupon_amount: parseFloat(row.coupon_coupon_amount),
-            tx_archive_update_id: row.coupon_tx_archive_update_id,
-            tx_archive_record_time: row.coupon_tx_archive_record_time,
-            app_reward_amount: row.coupon_app_reward_amount
-                ? parseFloat(row.coupon_app_reward_amount)
-                : null,
-            created_at: row.coupon_created_at,
-            updated_at: row.coupon_updated_at,
-        };
-        const transfer = {
-            id: row.transfer_id,
-            api_tracking_id: row.transfer_api_tracking_id,
-            api_expires_at: row.transfer_api_expires_at,
-            transfer_sender_party_id: row.transfer_transfer_sender_party_id,
-            transfer_receiver_party_id: row.transfer_transfer_receiver_party_id,
-            transfer_amount: parseFloat(row.transfer_transfer_amount),
-            transfer_description: row.transfer_transfer_description,
-            transfer_burned_amount: parseFloat(row.transfer_transfer_burned_amount),
-            receiver_holding_cids: row.transfer_receiver_holding_cids,
-            sender_change_cids: row.transfer_sender_change_cids,
-            tx_update_id: row.transfer_tx_update_id,
-            tx_record_time: row.transfer_tx_record_time,
-            status: row.transfer_status,
-            app_reward_coupon_id: row.transfer_app_reward_coupon_id,
-            created_at: row.transfer_created_at,
-            updated_at: row.transfer_updated_at,
-        };
-        const redemption = row.redemption_id
-            ? {
-                id: row.redemption_id,
-                transfer_id: row.transfer_id,
-                app_reward_coupon_ids: [], // This would need to be fetched separately if needed
-                tx_update_id: row.redemption_tx_update_id,
-                tx_record_time: row.redemption_tx_record_time,
-                tx_synchronizer_id: row.redemption_tx_synchronizer_id,
-                tx_effective_at: row.redemption_tx_effective_at,
-                total_app_rewards: parseFloat(row.total_app_rewards),
-                created_at: row.redemption_created_at,
-                updated_at: row.redemption_updated_at,
-            }
-            : null;
-        return {
-            ...coupon,
-            transfer,
-            redemption,
-        };
-    }
-    mapPartyFromDb(row) {
-        return {
-            id: row.id,
-            party_id: row.party_id,
-            portal_id: row.portal_id,
-            provider: row.provider,
-            last_payment_until: row.last_payment_until,
-            is_active_customer_since: row.is_active_customer_since,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-            portal: row.company
-                ? {
-                    id: row.portal_id,
-                    company: row.company,
-                }
-                : null,
-        };
-    }
-    toSnakeCase(str) {
-        return str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
-    }
-    /**
-     * Get historical issuance rates for specific rounds from the scan_acs_store table This queries ClosedMiningRound
-     * contracts to get issuance rates for old rounds
-     *
-     * @param roundNumbers - Array of round numbers to get issuance rates for
-     * @returns Array of issuance rates for the specified rounds
-     */
-    async getHistoricalIssuanceRates(roundNumbers) {
-        if (roundNumbers.length === 0) {
-            return [];
-        }
-        // Query the scan_acs_store table for ClosedMiningRound contracts
-        // The template_id_qualified_name should match the ClosedMiningRound template
-        const query = `
-      SELECT
-        round,
-        create_arguments
-      FROM scan_acs_store
-      WHERE template_id_qualified_name LIKE '%:Splice.Round:ClosedMiningRound'
-        AND round = ANY($1)
-        AND create_arguments IS NOT NULL
-      ORDER BY round ASC
-    `;
-        try {
-            const result = await this.pool.query(query, [roundNumbers]);
-            return result.rows.map(row => {
-                const payload = row.create_arguments;
-                const roundNumber = parseInt(row.round, 10);
-                // Extract issuance rates from the contract payload
-                // The payload is stored as JSON and contains the issuance rate fields
-                const issuancePerFeaturedAppRewardCoupon = parseFloat(payload.issuancePerFeaturedAppRewardCoupon ?? '0');
-                const issuancePerUnfeaturedAppRewardCoupon = parseFloat(payload.issuancePerUnfeaturedAppRewardCoupon ?? '0');
-                return {
-                    roundNumber,
-                    issuancePerFeaturedAppRewardCoupon,
-                    issuancePerUnfeaturedAppRewardCoupon,
-                };
-            });
-        }
-        catch (error) {
-            console.error('Error querying historical issuance rates:', error);
-            throw new Error(`Failed to get historical issuance rates: ${error instanceof Error ? error.message : 'Unknown error'}`);
-        }
-    }
-    mapValuationReportFromDb(row) {
-        return {
-            id: row.id,
-            portal_id: row.portal_id,
-            company_id: row.company_id,
-            version: row.version,
-            contract_id: row.contract_id,
-            company_valuation: Number(row.company_valuation),
-            tx_update_id: row.tx_update_id,
-            last_valuation_until: row.last_valuation_until,
-            created_at: row.created_at,
-            updated_at: row.updated_at,
-        };
+        return this.valuationReports.insertValuationReport(report);
     }
-    /**
-     * Debug method to execute custom queries for investigation
-     *
-     * @param query - SQL query to execute
-     * @param params - Query parameters
-     * @returns Query result
-     */
+    // ========================================================================
+    // Debug Operations
+    // ========================================================================
     async debugQuery(query, params = []) {
         try {
             const result = await this.pool.query(query, params);
@@ -3087,62 +357,6 @@ class FairmintDbClient {
             throw new Error(`Failed to execute debug query: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }
-    // ========================================================================
-    // Cap Table Replication Methods
-    // ========================================================================
-    /**
-     * Get the next issuer that needs cap table replication.
-     *
-     * Returns issuers that have OCF objects and a canton party configured.
-     * Ordered by portal_id for deterministic processing order.
-     *
-     * @returns Issuer info with party_id and portal_id, or null if none need sync
-     */
-    async getNextIssuerToReplicate() {
-        const query = `
-      SELECT DISTINCT
-        cp.party_id,
-        cp.portal_id,
-        p.company
-      FROM canton_parties cp
-      LEFT JOIN portal p ON cp.portal_id = p.id
-      WHERE EXISTS (
-        SELECT 1 FROM latest_ocf_objects loo
-        WHERE loo.portal_id = cp.portal_id
-          AND loo.type = 'ISSUER'
-      )
-      ORDER BY cp.portal_id
-      LIMIT 1
-    `;
-        const result = await this.pool.query(query);
-        if (result.rows.length === 0) {
-            return null;
-        }
-        return result.rows[0];
-    }
-    /**
-     * Get all OCF objects for an issuer.
-     *
-     * Returns all OCF objects from the latest_ocf_objects view for a given portal.
-     * Used by the replication script to determine desired state.
-     *
-     * @param portalId - Portal ID of the issuer
-     * @returns Array of OCF objects with type, subtype, and data
-     */
-    async getAllOcfObjectsForIssuer(portalId) {
-        const query = `
-      SELECT
-        loo.id as ocf_id,
-        loo.type,
-        loo.subtype,
-        loo.ocf_data as data
-      FROM latest_ocf_objects loo
-      WHERE loo.portal_id = $1
-      ORDER BY loo.type, loo.subtype, loo.id
-    `;
-        const result = await this.pool.query(query, [portalId]);
-        return result.rows;
-    }
 }
 exports.FairmintDbClient = FairmintDbClient;
 //# sourceMappingURL=fairmintDbClient.js.map