@takaro/db 0.0.0-next.0da151e

package/dist/migrations/sql/20250815120000-optimize-shop-analytics-indexes.js

@@ -0,0 +1,40 @@
+export async function up(knex) {
+    // Index for filtering orders by domain, status, and date range
+    await knex.raw(`
+    CREATE INDEX IF NOT EXISTS idx_shoporder_analytics 
+    ON "shopOrder" (domain, status, "createdAt")
+    WHERE status IN ('COMPLETED', 'PAID')
+  `);
+    // Index for joining orders with listings and filtering by date
+    await knex.raw(`
+    CREATE INDEX IF NOT EXISTS idx_shoporder_listing_date 
+    ON "shopOrder" ("listingId", "createdAt")
+    WHERE status IN ('COMPLETED', 'PAID')
+  `);
+    // Index for customer analytics (unique players)
+    await knex.raw(`
+    CREATE INDEX IF NOT EXISTS idx_shoporder_player_analytics 
+    ON "shopOrder" (domain, "playerId", "createdAt")
+    WHERE status IN ('COMPLETED', 'PAID')
+  `);
+    // Composite index for shop listings to speed up joins
+    await knex.raw(`
+    CREATE INDEX IF NOT EXISTS idx_shoplisting_composite 
+    ON "shopListing" (id, "gameServerId", price)
+    WHERE "deletedAt" IS NULL AND draft = false
+  `);
+    // Index for filtering listings by game server and active status
+    await knex.raw(`
+    CREATE INDEX IF NOT EXISTS idx_shoplisting_active 
+    ON "shopListing" (domain, "gameServerId")
+    WHERE "deletedAt" IS NULL AND draft = false
+  `);
+}
+export async function down(knex) {
+    await knex.raw('DROP INDEX IF EXISTS idx_shoporder_analytics');
+    await knex.raw('DROP INDEX IF EXISTS idx_shoporder_listing_date');
+    await knex.raw('DROP INDEX IF EXISTS idx_shoporder_player_analytics');
+    await knex.raw('DROP INDEX IF EXISTS idx_shoplisting_composite');
+    await knex.raw('DROP INDEX IF EXISTS idx_shoplisting_active');
+}
+//# sourceMappingURL=20250815120000-optimize-shop-analytics-indexes.js.map

package/dist/migrations/sql/20250815120000-optimize-shop-analytics-indexes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20250815120000-optimize-shop-analytics-indexes.js","sourceRoot":"","sources":["../../../src/migrations/sql/20250815120000-optimize-shop-analytics-indexes.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,+DAA+D;IAC/D,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAC;IAEH,+DAA+D;IAC/D,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAC;IAEH,gEAAgE;IAChE,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,MAAM,IAAI,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAC/D,MAAM,IAAI,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IAClE,MAAM,IAAI,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACtE,MAAM,IAAI,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;IACjE,MAAM,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;AAChE,CAAC"}

package/dist/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.d.ts

@@ -0,0 +1,4 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;
+//# sourceMappingURL=20251014120000-shop-order-auto-cancel-on-listing-delete.d.ts.map

package/dist/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251014120000-shop-order-auto-cancel-on-listing-delete.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,wBAAsB,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DlD;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpD"}

package/dist/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.js

@@ -0,0 +1,70 @@
+export async function up(knex) {
+    // Step 1: Create trigger function that auto-cancels orders when listing is deleted
+    await knex.raw(`
+    CREATE OR REPLACE FUNCTION cancel_orders_on_listing_delete()
+    RETURNS TRIGGER AS $$
+    BEGIN
+      -- Only proceed if deletedAt changed from NULL to a value (soft-delete)
+      IF OLD."deletedAt" IS NULL AND NEW."deletedAt" IS NOT NULL THEN
+        -- Cancel all PAID orders for this listing and refund currency
+        -- Aggregate refunds by player to handle multiple orders correctly
+        WITH orders_to_cancel AS (
+          SELECT
+            so.id AS order_id,
+            so."playerId",
+            NEW."gameServerId",
+            NEW.domain AS domain,
+            NEW.price * so.amount AS refund_amount
+          FROM "shopOrder" so
+          WHERE so."listingId" = NEW.id
+            AND so.status = 'PAID'
+        ),
+        aggregated_refunds AS (
+          SELECT
+            "playerId",
+            "gameServerId",
+            domain,
+            SUM(refund_amount) AS total_refund
+          FROM orders_to_cancel
+          GROUP BY "playerId", "gameServerId", domain
+        )
+        -- Update playerOnGameServer currency with aggregated total
+        UPDATE "playerOnGameServer" pogs
+        SET currency = pogs.currency + ar.total_refund
+        FROM aggregated_refunds ar
+        WHERE pogs."playerId" = ar."playerId"
+          AND pogs."gameServerId" = ar."gameServerId"
+          AND pogs.domain = ar.domain;
+
+        -- Update order status to CANCELED
+        UPDATE "shopOrder"
+        SET status = 'CANCELED'
+        WHERE "listingId" = NEW.id
+          AND status = 'PAID';
+      END IF;
+
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+  `);
+    // Step 2: Create trigger on shopListing table
+    await knex.raw(`
+    CREATE TRIGGER auto_cancel_orders_on_listing_delete
+    AFTER UPDATE ON "shopListing"
+    FOR EACH ROW
+    WHEN (OLD."deletedAt" IS NULL AND NEW."deletedAt" IS NOT NULL)
+    EXECUTE FUNCTION cancel_orders_on_listing_delete();
+  `);
+}
+export async function down(knex) {
+    // Drop trigger
+    await knex.raw(`
+    DROP TRIGGER IF EXISTS auto_cancel_orders_on_listing_delete ON "shopListing";
+  `);
+    // Drop function
+    await knex.raw(`
+    DROP FUNCTION IF EXISTS cancel_orders_on_listing_delete();
+  `);
+    // Note: We don't reverse the data cleanup since those were genuinely bad orders
+}
+//# sourceMappingURL=20251014120000-shop-order-auto-cancel-on-listing-delete.js.map

package/dist/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251014120000-shop-order-auto-cancel-on-listing-delete.js","sourceRoot":"","sources":["../../../src/migrations/sql/20251014120000-shop-order-auto-cancel-on-listing-delete.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,mFAAmF;IACnF,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8Cd,CAAC,CAAC;IAEH,8CAA8C;IAC9C,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;GAMd,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,eAAe;IACf,MAAM,IAAI,CAAC,GAAG,CAAC;;GAEd,CAAC,CAAC;IAEH,gBAAgB;IAChB,MAAM,IAAI,CAAC,GAAG,CAAC;;GAEd,CAAC,CAAC;IAEH,gFAAgF;AAClF,CAAC"}

package/dist/migrations/sql/20251101000000-add-deleted-domain-state.d.ts

@@ -0,0 +1,4 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;
+//# sourceMappingURL=20251101000000-add-deleted-domain-state.d.ts.map

package/dist/migrations/sql/20251101000000-add-deleted-domain-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251101000000-add-deleted-domain-state.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql/20251101000000-add-deleted-domain-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,wBAAsB,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBlD;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBpD"}

package/dist/migrations/sql/20251101000000-add-deleted-domain-state.js

@@ -0,0 +1,33 @@
+export async function up(knex) {
+    // PostgreSQL requires a multi-step process to update enum constraints
+    // 1. Add a temporary column with the new enum values
+    // 2. Copy data from old column to new column
+    // 3. Drop old column
+    // 4. Rename new column to old column name
+    await knex.schema.alterTable('domains', (table) => {
+        table.enum('state_new', ['ACTIVE', 'DISABLED', 'MAINTENANCE', 'DELETED']).notNullable().defaultTo('ACTIVE');
+    });
+    await knex.raw(`UPDATE domains SET state_new = state::text::varchar`);
+    await knex.schema.alterTable('domains', (table) => {
+        table.dropColumn('state');
+    });
+    await knex.schema.alterTable('domains', (table) => {
+        table.renameColumn('state_new', 'state');
+    });
+}
+export async function down(knex) {
+    // Revert to the original enum values (removing DELETED)
+    // First, ensure no domains are in DELETED state (or this will fail)
+    await knex.raw(`DELETE FROM domains WHERE state = 'DELETED'`);
+    await knex.schema.alterTable('domains', (table) => {
+        table.enum('state_new', ['ACTIVE', 'DISABLED', 'MAINTENANCE']).notNullable().defaultTo('ACTIVE');
+    });
+    await knex.raw(`UPDATE domains SET state_new = state::text::varchar`);
+    await knex.schema.alterTable('domains', (table) => {
+        table.dropColumn('state');
+    });
+    await knex.schema.alterTable('domains', (table) => {
+        table.renameColumn('state_new', 'state');
+    });
+}
+//# sourceMappingURL=20251101000000-add-deleted-domain-state.js.map

package/dist/migrations/sql/20251101000000-add-deleted-domain-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251101000000-add-deleted-domain-state.js","sourceRoot":"","sources":["../../../src/migrations/sql/20251101000000-add-deleted-domain-state.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,sEAAsE;IACtE,qDAAqD;IACrD,6CAA6C;IAC7C,qBAAqB;IACrB,0CAA0C;IAE1C,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IAEtE,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,wDAAwD;IACxD,oEAAoE;IACpE,MAAM,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;IAE9D,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IAEtE,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;QAChD,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/migrations/sql/20251108214824-unique-player-per-server.d.ts

@@ -0,0 +1,4 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;
+//# sourceMappingURL=20251108214824-unique-player-per-server.d.ts.map

package/dist/migrations/sql/20251108214824-unique-player-per-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251108214824-unique-player-per-server.d.ts","sourceRoot":"","sources":["../../../src/migrations/sql/20251108214824-unique-player-per-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,wBAAsB,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlD;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpD"}

package/dist/migrations/sql/20251108214824-unique-player-per-server.js

@@ -0,0 +1,27 @@
+export async function up(knex) {
+    // Delete duplicate rows where the same playerId has multiple different gameIds on the same server
+    // This violates the business rule that each player should have exactly one POG per server
+    // Keep the oldest POG (lowest id) for each (playerId, gameServerId) pair
+    await knex.raw(`
+    DELETE FROM "playerOnGameServer"
+    WHERE id IN (
+      SELECT id
+      FROM (
+        SELECT id,
+               ROW_NUMBER() OVER (PARTITION BY "playerId", "gameServerId" ORDER BY id) as rnk
+        FROM "playerOnGameServer"
+      ) t
+      WHERE t.rnk > 1
+    )
+  `);
+    // Add unique constraint to prevent one player from having multiple POGs on the same server
+    await knex.schema.alterTable('playerOnGameServer', (table) => {
+        table.unique(['playerId', 'gameServerId']);
+    });
+}
+export async function down(knex) {
+    await knex.schema.alterTable('playerOnGameServer', (table) => {
+        table.dropUnique(['playerId', 'gameServerId']);
+    });
+}
+//# sourceMappingURL=20251108214824-unique-player-per-server.js.map

package/dist/migrations/sql/20251108214824-unique-player-per-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20251108214824-unique-player-per-server.js","sourceRoot":"","sources":["../../../src/migrations/sql/20251108214824-unique-player-per-server.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,kGAAkG;IAClG,0FAA0F;IAC1F,yEAAyE;IACzE,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;GAWd,CAAC,CAAC;IAEH,2FAA2F;IAC3F,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3D,KAAK,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3D,KAAK,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/migrations/util/alterEnum.d.ts

@@ -0,0 +1,2 @@
+export declare function formatAlterTableEnumSql(tableName: string, columnName: string, enums: string[]): string;
+//# sourceMappingURL=alterEnum.d.ts.map

package/dist/migrations/util/alterEnum.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"alterEnum.d.ts","sourceRoot":"","sources":["../../../src/migrations/util/alterEnum.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAQ7F"}

package/dist/migrations/util/alterEnum.js

@@ -0,0 +1,8 @@
+export function formatAlterTableEnumSql(tableName, columnName, enums) {
+    const constraintName = `${tableName}_${columnName}_check`;
+    return [
+        `ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`,
+        `ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" CHECK ("${columnName}" = ANY (ARRAY['${enums.join("'::text, '")}'::text]));`,
+    ].join('\n');
+}
+//# sourceMappingURL=alterEnum.js.map

package/dist/migrations/util/alterEnum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alterEnum.js","sourceRoot":"","sources":["../../../src/migrations/util/alterEnum.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,uBAAuB,CAAC,SAAiB,EAAE,UAAkB,EAAE,KAAe;IAC5F,MAAM,cAAc,GAAG,GAAG,SAAS,IAAI,UAAU,QAAQ,CAAC;IAC1D,OAAO;QACL,gBAAgB,SAAS,gCAAgC,cAAc,IAAI;QAC3E,gBAAgB,SAAS,qBAAqB,cAAc,aAAa,UAAU,mBAAmB,KAAK,CAAC,IAAI,CAC9G,YAAY,CACb,aAAa;KACf,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}

package/dist/queryBuilder.d.ts

@@ -0,0 +1,43 @@
+import { QueryBuilder as ObjectionQueryBuilder, Model as ObjectionModel, Page } from 'objection';
+export declare class ITakaroQuery<T> {
+    filters?: {
+        [key: string]: unknown[] | string[] | boolean | null | undefined;
+    };
+    search?: {
+        [key: string]: unknown[] | string[] | boolean | null | undefined;
+    };
+    greaterThan?: {
+        [key in keyof T]?: unknown;
+    };
+    lessThan?: {
+        [key in keyof T]?: unknown;
+    };
+    page?: number;
+    limit?: number;
+    sortBy?: string;
+    sortDirection?: SortDirection;
+    extend?: string[];
+}
+export declare enum SortDirection {
+    asc = "asc",
+    desc = "desc"
+}
+export declare function populateModelColumns(): Promise<void>;
+export declare class QueryBuilder<Model extends ObjectionModel, OutputDTO> {
+    private query;
+    constructor(rawQuery?: ITakaroQuery<OutputDTO>);
+    private validateArrayFilters;
+    /**
+     * Our custom query builder can only handle columns that exist in the table
+     * However, we might want to do complex/relational logic in higher layers
+     * To make sure we don't error out here, we filter out any columns that don't exist in the current table
+     */
+    private cleanQueryObject;
+    build(queryBuilder: ObjectionQueryBuilder<Model, Model[]>): ObjectionQueryBuilder<Model, Page<Model>>;
+    private filters;
+    private greaterThan;
+    private lessThan;
+    private sorting;
+    private pagination;
+}
+//# sourceMappingURL=queryBuilder.d.ts.map

package/dist/queryBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryBuilder.d.ts","sourceRoot":"","sources":["../src/queryBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,IAAI,qBAAqB,EACrC,KAAK,IAAI,cAAc,EACvB,IAAI,EAIL,MAAM,WAAW,CAAC;AAGnB,qBAAa,YAAY,CAAC,CAAC;IAEzB,OAAO,CAAC,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;KAClE,CAAC;IAGF,MAAM,CAAC,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;KAClE,CAAC;IAGF,WAAW,CAAC,EAAE;SACX,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO;KAC3B,CAAC;IAGF,QAAQ,CAAC,EAAE;SACR,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO;KAC3B,CAAC;IAIF,IAAI,CAAC,EAAE,MAAM,CAAC;IAId,KAAK,CAAC,EAAE,MAAM,CAAC;IAIf,MAAM,CAAC,EAAE,MAAM,CAAC;IAKhB,aAAa,CAAC,EAAE,aAAa,CAAC;IAI9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,oBAAY,aAAa;IACvB,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAID,wBAAsB,oBAAoB,kBAczC;AAID,qBAAa,YAAY,CAAC,KAAK,SAAS,cAAc,EAAE,SAAS;IAC/D,OAAO,CAAC,KAAK,CAA0B;gBAC3B,QAAQ,GAAE,YAAY,CAAC,SAAS,CAAsB;IAKlE,OAAO,CAAC,oBAAoB;IAwB5B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAgCxB,KAAK,CAAC,YAAY,EAAE,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAqCrG,OAAO,CAAC,OAAO;IA0Bf,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,OAAO;IAaf,OAAO,CAAC,UAAU;CAMnB"}

package/dist/queryBuilder.js

@@ -0,0 +1,224 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { IsEnum, IsNumber, IsOptional, IsString } from 'class-validator';
+import { errors } from '@takaro/util';
+import { getKnex, isDbAvailable } from './knex.js';
+export class ITakaroQuery {
+}
+__decorate([
+    IsOptional(),
+    __metadata("design:type", Object)
+], ITakaroQuery.prototype, "filters", void 0);
+__decorate([
+    IsOptional(),
+    __metadata("design:type", Object)
+], ITakaroQuery.prototype, "search", void 0);
+__decorate([
+    IsOptional(),
+    __metadata("design:type", Object)
+], ITakaroQuery.prototype, "greaterThan", void 0);
+__decorate([
+    IsOptional(),
+    __metadata("design:type", Object)
+], ITakaroQuery.prototype, "lessThan", void 0);
+__decorate([
+    IsOptional(),
+    IsNumber(),
+    __metadata("design:type", Number)
+], ITakaroQuery.prototype, "page", void 0);
+__decorate([
+    IsOptional(),
+    IsNumber(),
+    __metadata("design:type", Number)
+], ITakaroQuery.prototype, "limit", void 0);
+__decorate([
+    IsOptional(),
+    IsString(),
+    __metadata("design:type", String)
+], ITakaroQuery.prototype, "sortBy", void 0);
+__decorate([
+    IsOptional(),
+    IsString(),
+    IsEnum(['asc', 'desc']),
+    __metadata("design:type", String)
+], ITakaroQuery.prototype, "sortDirection", void 0);
+__decorate([
+    IsOptional(),
+    IsString({ each: true }),
+    __metadata("design:type", Array)
+], ITakaroQuery.prototype, "extend", void 0);
+export var SortDirection;
+(function (SortDirection) {
+    SortDirection["asc"] = "asc";
+    SortDirection["desc"] = "desc";
+})(SortDirection || (SortDirection = {}));
+const modelColumns = new Map();
+export async function populateModelColumns() {
+    if (await isDbAvailable()) {
+        const knex = await getKnex();
+        // Find all tables
+        const tables = await knex.raw("SELECT table_name FROM information_schema.tables WHERE table_schema = 'public' AND table_type = 'BASE TABLE'");
+        // For each table, store the columns
+        for (const table of tables.rows) {
+            const tableName = table.table_name;
+            const columns = await knex(tableName).columnInfo();
+            modelColumns.set(tableName, Object.keys(columns));
+        }
+    }
+}
+await populateModelColumns();
+export class QueryBuilder {
+    constructor(rawQuery = new ITakaroQuery()) {
+        this.query = JSON.parse(JSON.stringify(rawQuery));
+        this.validateArrayFilters();
+    }
+    validateArrayFilters() {
+        // Validate filters
+        if (this.query.filters) {
+            for (const [key, value] of Object.entries(this.query.filters)) {
+                if (value !== null && value !== undefined && !Array.isArray(value) && typeof value !== 'boolean') {
+                    throw new errors.BadRequestError(`Filter values must be arrays or boolean. Found invalid value for '${key}': '${value}'. Example: { ${key}: ["${value}"] }`);
+                }
+            }
+        }
+        // Validate search
+        if (this.query.search) {
+            for (const [key, value] of Object.entries(this.query.search)) {
+                if (value !== null && value !== undefined && !Array.isArray(value) && typeof value !== 'boolean') {
+                    throw new errors.BadRequestError(`Search values must be arrays or boolean. Found invalid value for '${key}': '${value}'. Example: { ${key}: ["${value}"] }`);
+                }
+            }
+        }
+    }
+    /**
+     * Our custom query builder can only handle columns that exist in the table
+     * However, we might want to do complex/relational logic in higher layers
+     * To make sure we don't error out here, we filter out any columns that don't exist in the current table
+     */
+    cleanQueryObject(tableName) {
+        const columns = modelColumns.get(tableName) ?? [];
+        for (const key in this.query.filters) {
+            if (Object.prototype.hasOwnProperty.call(this.query.filters, key)) {
+                if (!columns.includes(key)) {
+                    if (this.query.filters) {
+                        // Preserve boolean values, only clear arrays
+                        if (typeof this.query.filters[key] !== 'boolean') {
+                            this.query.filters[key] = [];
+                        }
+                    }
+                }
+            }
+        }
+        for (const key in this.query.search) {
+            if (Object.prototype.hasOwnProperty.call(this.query.search, key)) {
+                if (!columns.includes(key)) {
+                    if (this.query.search) {
+                        // Preserve boolean values, only clear arrays
+                        if (typeof this.query.search[key] !== 'boolean') {
+                            this.query.search[key] = [];
+                        }
+                    }
+                }
+            }
+        }
+        return this.query;
+    }
+    build(queryBuilder) {
+        const tableName = queryBuilder.modelClass().tableName;
+        this.cleanQueryObject(tableName);
+        const pagination = this.pagination();
+        const sorting = this.sorting();
+        let qry = queryBuilder.page(pagination.page, pagination.limit).orderBy(sorting.sortBy, sorting.sortDirection);
+        qry = this.filters(tableName, qry);
+        qry = this.greaterThan(tableName, qry);
+        qry = this.lessThan(tableName, qry);
+        if (this.query.search) {
+            qry.where((builder) => {
+                for (const search in this.query.search) {
+                    if (Object.prototype.hasOwnProperty.call(this.query.search, search)) {
+                        const searchVal = this.query.search[search];
+                        if (Array.isArray(searchVal)) {
+                            searchVal.forEach((val) => {
+                                if (val) {
+                                    builder.orWhere(`${tableName}.${search}`, 'ilike', `%${val}%`);
+                                }
+                            });
+                        }
+                    }
+                }
+            });
+        }
+        for (const extend of this.query.extend ?? []) {
+            qry.withGraphFetched(extend);
+        }
+        return qry;
+    }
+    filters(tableName, query) {
+        for (const filter in this.query.filters) {
+            if (Object.prototype.hasOwnProperty.call(this.query.filters, filter)) {
+                const searchVal = this.query.filters[filter];
+                if (typeof searchVal === 'boolean') {
+                    query.where(`${tableName}.${filter}`, searchVal);
+                }
+                else if (searchVal && Array.isArray(searchVal)) {
+                    if (searchVal.includes('null')) {
+                        query.whereNull(`${tableName}.${filter}`);
+                        continue;
+                    }
+                    if (searchVal.length) {
+                        query.whereIn(`${tableName}.${filter}`, searchVal.filter(Boolean));
+                    }
+                }
+            }
+        }
+        return query;
+    }
+    greaterThan(tableName, query) {
+        for (const filter in this.query.greaterThan) {
+            if (Object.prototype.hasOwnProperty.call(this.query.greaterThan, filter)) {
+                const searchVal = this.query.greaterThan[filter];
+                if (searchVal) {
+                    query.where(`${tableName}.${filter}`, '>=', searchVal);
+                }
+            }
+        }
+        return query;
+    }
+    lessThan(tableName, query) {
+        for (const filter in this.query.lessThan) {
+            if (Object.prototype.hasOwnProperty.call(this.query.lessThan, filter)) {
+                const searchVal = this.query.lessThan[filter];
+                if (searchVal) {
+                    query.where(`${tableName}.${filter}`, '<=', searchVal);
+                }
+            }
+        }
+        return query;
+    }
+    sorting() {
+        if (!this.query.sortBy) {
+            return {
+                sortBy: 'id',
+                sortDirection: SortDirection.asc,
+            };
+        }
+        return {
+            sortBy: this.query.sortBy,
+            sortDirection: this.query.sortDirection ?? SortDirection.asc,
+        };
+    }
+    pagination() {
+        return {
+            page: this.query.page ?? 0,
+            limit: this.query.limit ?? 100,
+        };
+    }
+}
+//# sourceMappingURL=queryBuilder.js.map

package/dist/queryBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryBuilder.js","sourceRoot":"","sources":["../src/queryBuilder.ts"],"names":[],"mappings":"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"}

package/dist/redis.d.ts

@@ -0,0 +1,21 @@
+import { createClient, RedisClientOptions } from 'redis';
+export type RedisClient = ReturnType<typeof createClient>;
+declare class RedisClass {
+    private log;
+    private clients;
+    /**
+     * Get a Redis client from the cache, or create a new one.
+     * The client will already be connected.
+     * @param name Name for the client, used to cache the client.
+     * @param extra Any extra Redis options to pass to the client.
+     * @returns
+     */
+    getClient(name: string, extra?: RedisClientOptions): Promise<RedisClient>;
+    /**
+     * Disconnect all clients and clear the cache.
+     */
+    destroy(): Promise<void>;
+}
+export declare const Redis: RedisClass;
+export {};
+//# sourceMappingURL=redis.d.ts.map

package/dist/redis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../src/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAIzD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAE1D,cAAM,UAAU;IACd,OAAO,CAAC,GAAG,CAAmB;IAE9B,OAAO,CAAC,OAAO,CAAkC;IAEjD;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,kBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IA6BnF;;OAEG;IACG,OAAO;CAMd;AAED,eAAO,MAAM,KAAK,YAAmB,CAAC"}

package/dist/redis.js

@@ -0,0 +1,50 @@
+import { createClient } from 'redis';
+import { config } from './config.js';
+import { logger, health } from '@takaro/util';
+class RedisClass {
+    constructor() {
+        this.log = logger('redis');
+        this.clients = new Map();
+    }
+    /**
+     * Get a Redis client from the cache, or create a new one.
+     * The client will already be connected.
+     * @param name Name for the client, used to cache the client.
+     * @param extra Any extra Redis options to pass to the client.
+     * @returns
+     */
+    async getClient(name, extra = {}) {
+        const normalizedName = name.toLowerCase().replaceAll(/[^a-z0-9]/g, '_');
+        const cachedClient = this.clients.get(normalizedName);
+        if (cachedClient)
+            return cachedClient;
+        this.log.debug(`Creating new Redis client for ${normalizedName}`);
+        const client = createClient({
+            name: normalizedName,
+            username: config.get('redis.username'),
+            password: config.get('redis.password'),
+            socket: {
+                host: config.get('redis.host'),
+                port: config.get('redis.port'),
+            },
+            ...extra,
+        });
+        await client.connect();
+        this.clients.set(normalizedName, client);
+        health.registerHook(normalizedName, async () => {
+            await client.ping();
+        });
+        return client;
+    }
+    /**
+     * Disconnect all clients and clear the cache.
+     */
+    async destroy() {
+        for (const [name, client] of this.clients.entries()) {
+            this.log.debug(`Disconnecting Redis client ${name}`);
+            await client.disconnect();
+        }
+    }
+}
+export const Redis = new RedisClass();
+//# sourceMappingURL=redis.js.map

package/dist/redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../src/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsB,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI9C,MAAM,UAAU;IAAhB;QACU,QAAG,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAEtB,YAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;IA+CnD,CAAC;IA7CC;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,QAA4B,EAAE;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEtD,IAAI,YAAY;YAAE,OAAO,YAAY,CAAC;QAEtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,cAAc,EAAE,CAAC,CAAC;QAElE,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACtC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACtC,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;gBAC9B,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;aAC/B;YACD,GAAG,KAAK;SACT,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAEzC,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;YACrD,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC"}

package/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@takaro/db",
+  "version": "0.0.0-next.0da151e",
+  "description": "An opinionated data layer",
+  "main": "dist/main.js",
+  "types": "dist/main.d.ts",
+  "type": "module",
+  "scripts": {
+    "start:dev": "tsc --watch --preserveWatchOutput -p ./tsconfig.build.json",
+    "build": "tsc -p ./tsconfig.build.json",
+    "migrate:create": "run(){ touch ./src/migrations/sql/$(date -u +\"%Y%m%d%H%M%S\")-$1.ts; }; run"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}