@windrun-huaiin/backend-core 28.0.0 → 29.0.0

package/src/services/database/transaction.service.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Prisma } from '@core/db/prisma-model-type';
+import type { Prisma } from '@core/db/prisma-model-type';
 import type { Transaction } from '@core/db/prisma-model-type';
 import { OrderStatus, TransactionType, PaySupplier, PaymentStatus } from '@core/db/constants';
 import { checkAndFallbackWithNonTCClient } from '@core/prisma/index';
@@ -363,20 +363,20 @@ export class TransactionService {
 
     // Calculate statistics
     const totalRevenue = successfulTransactions.reduce(
-      (sum, t) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0),
+      (sum: number, t: any) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0),
       0
     );
 
     const subscriptionRevenue = successfulTransactions
-      .filter(t => t.type === TransactionType.SUBSCRIPTION)
-      .reduce((sum, t) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0), 0);
+      .filter((t: any) => t.type === TransactionType.SUBSCRIPTION)
+      .reduce((sum: number, t: any) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0), 0);
 
     const oneTimeRevenue = successfulTransactions
-      .filter(t => t.type === TransactionType.ONE_TIME)
-      .reduce((sum, t) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0), 0);
+      .filter((t: any) => t.type === TransactionType.ONE_TIME)
+      .reduce((sum: number, t: any) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0), 0);
 
     const refundedAmount = refundedTransactions.reduce(
-      (sum, t) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0),
+      (sum: number, t: any) => sum + (t.amount ? parseFloat(t.amount.toString()) : 0),
       0
     );
 
@@ -399,22 +399,21 @@ export class TransactionService {
 
     const client = checkAndFallbackWithNonTCClient(tx);
 
-    const query = Prisma.sql`
-      SELECT 
-        DATE(paid_at) as date,
-        COUNT(*) as transactions,
-        SUM(amount) as revenue,
-        SUM(CASE WHEN type = 'subscription' THEN amount ELSE 0 END) as subscription_revenue,
-        SUM(CASE WHEN type = 'one_time' THEN amount ELSE 0 END) as onetime_revenue
-      FROM transactions
-      WHERE order_status = 'success'
-        AND deleted = 0
-        AND paid_at >= ${startDate}
-      GROUP BY DATE(paid_at)
-      ORDER BY date DESC
-    `;
-
-    const result = await client.$queryRaw(query);
+    const result = await client.$queryRawUnsafe(
+      `SELECT
+         DATE(paid_at) as date,
+         COUNT(*) as transactions,
+         SUM(amount) as revenue,
+         SUM(CASE WHEN type = 'subscription' THEN amount ELSE 0 END) as subscription_revenue,
+         SUM(CASE WHEN type = 'one_time' THEN amount ELSE 0 END) as onetime_revenue
+       FROM transactions
+       WHERE order_status = 'success'
+         AND deleted = 0
+         AND paid_at >= $1
+       GROUP BY DATE(paid_at)
+       ORDER BY date DESC`,
+      startDate,
+    );
 
     return result as any[];
   }

package/src/services/database/user.service.ts

@@ -1,16 +1,30 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import type { Prisma } from '@core/db/prisma-model-type';
-import type { User } from '@core/db/prisma-model-type';
+import type { CoreJsonValue, User } from '@core/db/prisma-model-type';
 import { UserStatus } from '@core/db/constants';
 import { checkAndFallbackWithNonTCClient } from '@core/prisma/index';
 
+export interface UpdateUserInput {
+  fingerprintId?: string | null;
+  sourceRef?: CoreJsonValue | null;
+  clerkUserId?: string | null;
+  stripeCusId?: string | null;
+  email?: string | null;
+  userName?: string | null;
+  status?: string;
+}
+
+function toPrismaJsonValue(value: CoreJsonValue | null | undefined) {
+  return value === undefined ? undefined : value;
+}
+
 export class UserService {
 
   // Create user
   async createUser(data: {
     fingerprintId?: string;
-    sourceRef?: Prisma.InputJsonValue;
+    sourceRef?: CoreJsonValue;
     clerkUserId?: string;
     stripeCusId?: string;
     email?: string;
@@ -22,7 +36,7 @@ export class UserService {
     return await client.user.create({
       data: {
         fingerprintId: data.fingerprintId,
-        sourceRef: data.sourceRef,
+        sourceRef: toPrismaJsonValue(data.sourceRef),
         clerkUserId: data.clerkUserId,
         stripeCusId: data.stripeCusId,
         email: data.email,
@@ -83,14 +97,17 @@ export class UserService {
   // Update user
   async updateUser(
     userId: string,
-    data: Prisma.UserUpdateInput,
+    data: UpdateUserInput,
     tx?: Prisma.TransactionClient
   ): Promise<User> {
     const client = checkAndFallbackWithNonTCClient(tx);
 
     return await client.user.update({
       where: { userId },
-      data,
+      data: {
+        ...data,
+        sourceRef: toPrismaJsonValue(data.sourceRef),
+      },
     });
   }
 
@@ -146,7 +163,7 @@ export class UserService {
     skip?: number;
     take?: number;
     status?: string;
-    orderBy?: Prisma.UserOrderByWithRelationInput;
+    orderBy?: Record<string, 'asc' | 'desc'>;
   }, tx?: Prisma.TransactionClient): Promise<{ users: User[]; total: number }> {
     const client = checkAndFallbackWithNonTCClient(tx);
     const { skip = 0, take = 10, status, orderBy = { createdAt: 'desc' } } = params;

package/dist/core-prisma/browser.d.ts

@@ -1,40 +0,0 @@
-import * as Prisma from './internal/prismaNamespaceBrowser';
-export { Prisma };
-export * as $Enums from './enums';
-export * from './enums';
-/**
- * Model User
- *
- */
-export type User = Prisma.UserModel;
-/**
- * Model Subscription
- *
- */
-export type Subscription = Prisma.SubscriptionModel;
-/**
- * Model Credit
- *
- */
-export type Credit = Prisma.CreditModel;
-/**
- * Model Transaction
- *
- */
-export type Transaction = Prisma.TransactionModel;
-/**
- * Model CreditAuditLog
- *
- */
-export type CreditAuditLog = Prisma.CreditAuditLogModel;
-/**
- * Model UserBackup
- *
- */
-export type UserBackup = Prisma.UserBackupModel;
-/**
- * Model Apilog
- *
- */
-export type Apilog = Prisma.ApilogModel;
-//# sourceMappingURL=browser.d.ts.map

package/dist/core-prisma/browser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/core-prisma/browser.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,MAAM,mCAAmC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,CAAA;AACjB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAA;AACjC,cAAc,SAAS,CAAC;AACxB;;;GAGG;AACH,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;AACnC;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAA;AACnD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAA;AACvC;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAA;AACjD;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAA;AACvD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAA;AAC/C;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAA"}

package/dist/core-prisma/client.d.ts

@@ -1,57 +0,0 @@
-import * as runtime from "@prisma/client/runtime/client";
-import * as $Class from "./internal/class";
-import * as Prisma from "./internal/prismaNamespace";
-export * as $Enums from './enums';
-export * from "./enums";
-/**
- * ## Prisma Client
- *
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient()
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- *
- * Read more in our [docs](https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client).
- */
-export declare const PrismaClient: $Class.PrismaClientConstructor;
-export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts extends Prisma.PrismaClientOptions["omit"] = Prisma.PrismaClientOptions["omit"], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = $Class.PrismaClient<LogOpts, OmitOpts, ExtArgs>;
-export { Prisma };
-/**
- * Model User
- *
- */
-export type User = Prisma.UserModel;
-/**
- * Model Subscription
- *
- */
-export type Subscription = Prisma.SubscriptionModel;
-/**
- * Model Credit
- *
- */
-export type Credit = Prisma.CreditModel;
-/**
- * Model Transaction
- *
- */
-export type Transaction = Prisma.TransactionModel;
-/**
- * Model CreditAuditLog
- *
- */
-export type CreditAuditLog = Prisma.CreditAuditLogModel;
-/**
- * Model UserBackup
- *
- */
-export type UserBackup = Prisma.UserBackupModel;
-/**
- * Model Apilog
- *
- */
-export type Apilog = Prisma.ApilogModel;
-//# sourceMappingURL=client.d.ts.map

package/dist/core-prisma/client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/core-prisma/client.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,OAAO,MAAM,+BAA+B,CAAA;AAExD,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AAEpD,OAAO,KAAK,MAAM,MAAM,SAAS,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,YAAY,gCAAyC,CAAA;AAClE,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,MAAM,CAAC,QAAQ,GAAG,KAAK,EAAE,QAAQ,SAAS,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,SAAS,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;AAC3S,OAAO,EAAE,MAAM,EAAE,CAAA;AAIjB;;;GAGG;AACH,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;AACnC;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,iBAAiB,CAAA;AACnD;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAA;AACvC;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAA;AACjD;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAA;AACvD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,eAAe,CAAA;AAC/C;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAA"}

package/dist/core-prisma/client.js

@@ -1,55 +0,0 @@
-'use strict';
-
-var path = require('node:path');
-var node_url = require('node:url');
-var _class = require('./internal/class.js');
-var prismaNamespace = require('./internal/prismaNamespace.js');
-
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
-function _interopNamespaceDefault(e) {
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n.default = e;
-	return Object.freeze(n);
-}
-
-var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file should be your main import to use Prisma. Through it you get access to all the models, enums, and input types.
- * If you're looking for something you can import in the client-side of your application, please refer to the `browser.ts` file instead.
- *
- * 🟢 You can import this file directly.
- */
-globalThis['__dirname'] = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('core-prisma/client.js', document.baseURI).href))));
-/**
- * ## Prisma Client
- *
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient()
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- *
- * Read more in our [docs](https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client).
- */
-const PrismaClient = _class.getPrismaClientClass(__dirname);
-
-exports.Prisma = prismaNamespace;
-exports.PrismaClient = PrismaClient;

package/dist/core-prisma/client.mjs

@@ -1,33 +0,0 @@
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { getPrismaClientClass } from './internal/class.mjs';
-import * as prismaNamespace from './internal/prismaNamespace.mjs';
-export { prismaNamespace as Prisma };
-
-/* !!! This is code generated by Prisma. Do not edit directly. !!! */
-/* eslint-disable */
-// biome-ignore-all lint: generated file
-// @ts-nocheck 
-/*
- * This file should be your main import to use Prisma. Through it you get access to all the models, enums, and input types.
- * If you're looking for something you can import in the client-side of your application, please refer to the `browser.ts` file instead.
- *
- * 🟢 You can import this file directly.
- */
-globalThis['__dirname'] = path.dirname(fileURLToPath(import.meta.url));
-/**
- * ## Prisma Client
- *
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient()
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- *
- * Read more in our [docs](https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client).
- */
-const PrismaClient = getPrismaClientClass(__dirname);
-
-export { PrismaClient };