Move all database, stripe, and merit operations into their own respective services folder

packages/app/control/docs/advanced/api-reference.mdx

@@ -65,7 +65,7 @@ List all Echo apps owned by the authenticated user.
 ```
 
 <AutoTypeTable
-  path="src/services/apps/list.ts"
+  path="src/services/db/apps/list.ts"
   type={`Awaited<ReturnType<typeof listOwnerApps>>["items"][number]`}
 />
 
@@ -83,7 +83,7 @@ Get detailed app information for programmatic access.
 **Response Type:**
 
 <AutoTypeTable
-  path="src/services/user/balance.ts"
+  path="src/services/db/user/balance.ts"
   type={`Awaited<ReturnType<typeof getUserGlobalBalance>>`}
 />
 
@@ -105,7 +105,7 @@ Get authenticated user's credit balance.
 **Response Type:**
 
 <AutoTypeTable
-  path="src/services/user/balance.ts"
+  path="src/services/db/user/balance.ts"
   type={`Awaited<ReturnType<typeof getUserGlobalBalance>>`}
 />
 
@@ -129,8 +129,8 @@ Get user's free tier spending information for a specific app.
 ```
 
 <AutoTypeTable
-  path="src/lib/spend-pools/fetch-user-spend.ts"
-  type={`Awaited<ReturnType<typeof getCustomerSpendInfoForApp>>["userSpendInfo"]`}
+  path="src/services/db/user/app-spend-pool.ts"
+  type={`Awaited<ReturnType<typeof getUserSpendInfoForApp>>["userSpendInfo"]`}
 />
 
 ## Payments

packages/app/control/eslint.config.mjs

@@ -112,9 +112,69 @@ export default tseslint.config(
           },
         },
       },
+      'no-db-client-outside-db': {
+        rules: {
+          'no-db-client-outside-db': {
+            meta: {
+              type: 'problem',
+              docs: {
+                description:
+                  'Disallow @/services/db/client imports outside of @db/ folder',
+                category: 'Best Practices',
+                recommended: true,
+              },
+              fixable: null,
+              schema: [],
+              messages: {
+                noDbClientOutsideDb:
+                  'Direct imports from @/services/db/client are not allowed outside of the @/services/db/ folder. Create a new service in @/services/db instead.',
+              },
+            },
+            create(context) {
+              const filename = context.getFilename();
+
+              // Allow imports within the @db/ folder structure
+              const isDbFolderFile = filename.includes('/services/db/');
+
+              // Allow imports in the client.ts file itself
+              const isClientFile = filename.includes('/services/db/client.ts');
+
+              if (isDbFolderFile || isClientFile) {
+                return {};
+              }
+
+              return {
+                ImportDeclaration(node) {
+                  // Check if the import source is @/services/db/client or relative imports to services/db/client
+                  if (
+                    node.source &&
+                    node.source.type === 'Literal' &&
+                    typeof node.source.value === 'string'
+                  ) {
+                    const importPath = node.source.value;
+                    const isDbClientImport =
+                      importPath === '@/services/db/client' ||
+                      importPath.endsWith('/db/client') ||
+                      importPath.endsWith('./services/db/client') ||
+                      importPath.endsWith('../services/db/client');
+
+                    if (isDbClientImport) {
+                      context.report({
+                        node,
+                        messageId: 'noDbClientOutsideDb',
+                      });
+                    }
+                  }
+                },
+              };
+            },
+          },
+        },
+      },
     },
     rules: {
       'no-process-env-outside-env/no-process-env-outside-env': 'error',
+      'no-db-client-outside-db/no-db-client-outside-db': 'error',
     },
   }
 );

packages/app/control/scripts/seed-app-usage.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env tsx
 
-import { db } from '../src/lib/db';
+// eslint-disable-next-line no-db-client-outside-db/no-db-client-outside-db
+import { db } from '../src/services/db/client';
 import { faker } from '@faker-js/faker';
 import { subDays, addDays, format } from 'date-fns';
 

packages/app/control/scripts/seed-markup-rewards.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env tsx
 
-import { db } from '../src/lib/db';
+// eslint-disable-next-line no-db-client-outside-db/no-db-client-outside-db
+import { db } from '../src/services/db/client';
 import { faker } from '@faker-js/faker';
 import { addDays, subDays, format } from 'date-fns';
 

packages/app/control/scripts/seed-referral-rewards.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env tsx
 
-import { db } from '../src/lib/db';
+// eslint-disable-next-line no-db-client-outside-db/no-db-client-outside-db
+import { db } from '../src/services/db/client';
 import { faker } from '@faker-js/faker';
 import { addDays, subDays, format } from 'date-fns';
 

packages/app/control/scripts/seed-users.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env tsx
 
-import { db } from '../src/lib/db';
+// eslint-disable-next-line no-db-client-outside-db/no-db-client-outside-db
+import { db } from '../src/services/db/client';
 import { faker } from '@faker-js/faker';
 
 interface SeedUsersOptions {

packages/app/control/src/app/(app)/(home)/activity/_components/filters/event-types-filter.tsx

@@ -15,7 +15,7 @@ import {
 import { Skeleton } from '@/components/ui/skeleton';
 
 import { useFiltersContext } from '../../contexts/filters-context';
-import { FeedActivityType } from '@/services/feed/types';
+import { FeedActivityType } from '@/services/db/feed/types';
 
 export const EventTypesFilter = () => {
   const { eventType, setEventType } = useFiltersContext();

packages/app/control/src/app/(app)/(home)/activity/_components/list/item/content/index.tsx

@@ -1,8 +1,8 @@
 import { TransactionContent } from './transactions';
 import { SignInContent } from './sign-in';
 
-import type { FeedActivity } from '@/services/feed/types';
-import { FeedActivityType } from '@/services/feed/types';
+import type { FeedActivity } from '@/services/db/feed/types';
+import { FeedActivityType } from '@/services/db/feed/types';
 
 interface Props {
   activity: FeedActivity;

packages/app/control/src/app/(app)/(home)/activity/_components/list/item/content/sign-in.tsx

@@ -1,4 +1,4 @@
-import type { SignInEventData } from '@/services/feed/types';
+import type { SignInEventData } from '@/services/db/feed/types';
 import { User, Users } from 'lucide-react';
 
 interface Props {

packages/app/control/src/app/(app)/(home)/activity/_components/list/item/content/transactions.tsx

@@ -1,5 +1,5 @@
 import { formatCurrency } from '@/lib/utils';
-import type { TransactionEventData } from '@/services/feed/types';
+import type { TransactionEventData } from '@/services/db/feed/types';
 import { DollarSign } from 'lucide-react';
 
 interface Props {

packages/app/control/src/app/(app)/(home)/activity/_components/list/item/index.tsx

@@ -14,7 +14,7 @@ import { UserAvatar } from '@/components/utils/user-avatar';
 
 import { ItemContent } from './content';
 
-import type { FeedActivity } from '@/services/feed/types';
+import type { FeedActivity } from '@/services/db/feed/types';
 
 interface Props {
   activity: FeedActivity;

packages/app/control/src/app/(app)/(home)/activity/contexts/filters-context.tsx

@@ -5,7 +5,7 @@ import { createContext, useContext, useEffect, useState } from 'react';
 import { subDays } from 'date-fns';
 
 import { ActivityTimeframe } from '@/types/timeframes';
-import type { FeedActivityType } from '@/services/feed/types';
+import type { FeedActivityType } from '@/services/db/feed/types';
 
 interface FiltersContextType {
   appId: string | undefined;

packages/app/control/src/app/(app)/(home)/dashboard/_components/personal/feed/items/content/index.tsx

@@ -1,8 +1,8 @@
 import { TransactionContent } from './transactions';
 import { SignInContent } from './sign-in';
 
-import type { FeedActivity } from '@/services/feed/types';
-import { FeedActivityType } from '@/services/feed/types';
+import type { FeedActivity } from '@/services/db/feed/types';
+import { FeedActivityType } from '@/services/db/feed/types';
 
 interface Props {
   activity: FeedActivity;

packages/app/control/src/app/(app)/(home)/dashboard/_components/personal/feed/items/content/sign-in.tsx

@@ -1,4 +1,4 @@
-import type { SignInEventData } from '@/services/feed/types';
+import type { SignInEventData } from '@/services/db/feed/types';
 
 interface Props {
   activity: SignInEventData;

packages/app/control/src/app/(app)/(home)/dashboard/_components/personal/feed/items/content/transactions.tsx

@@ -1,5 +1,5 @@
 import { formatCurrency } from '@/lib/utils';
-import type { TransactionEventData } from '@/services/feed/types';
+import type { TransactionEventData } from '@/services/db/feed/types';
 
 interface Props {
   numUsers: number;

packages/app/control/src/app/(app)/(home)/dashboard/_components/personal/feed/items/item.tsx

@@ -3,7 +3,7 @@ import {
   AvatarCirclesSkeleton,
 } from '@/components/ui/avatar-circles';
 import { UserAvatar } from '@/components/utils/user-avatar';
-import type { FeedActivity } from '@/services/feed/types';
+import type { FeedActivity } from '@/services/db/feed/types';
 import { formatDistanceToNow } from 'date-fns';
 import { Code } from 'lucide-react';
 import { ItemContent } from './content';

packages/app/control/src/app/(app)/(home)/new/_components/form.tsx

@@ -18,7 +18,7 @@ import { Separator } from '@/components/ui/separator';
 
 import { api } from '@/trpc/client';
 import { MarkupInput } from '../../../_components/markup/input';
-import { createAppSchema } from '@/services/apps/lib/schemas';
+import { createAppSchema } from '@/services/db/apps/lib/schemas';
 
 export const CreateAppForm = () => {
   const form = useForm<z.infer<typeof createAppSchema>>({

packages/app/control/src/app/(app)/admin/_components/completedPayouts.tsx

@@ -11,27 +11,13 @@ export function CompletedPayoutsTable({ pageSize = 10 }: Props) {
   const [page, setPage] = useState(0);
 
   const { data, isLoading, isFetching } =
-    api.admin.payouts.listCompleted.useQuery({
+    api.admin.payouts.list.completed.useQuery({
       cursor: page,
       page_size: pageSize,
     });
 
   if (isLoading) return <div>Loading completed payouts...</div>;
 
-  const payouts = (data?.items ?? []) as Array<{
-    id: string;
-    amount: number;
-    createdAt: string;
-    type: string;
-    userEmail: string | null;
-    userName: string | null;
-    echoAppName: string | null;
-    recipientGithubUrl: string | null;
-    recipientAddress: string | null;
-    transactionId: string | null;
-    senderAddress: string | null;
-  }>;
-
   return (
     <div className="space-y-4">
       <div className="flex items-center justify-between">
@@ -55,38 +41,38 @@ export function CompletedPayoutsTable({ pageSize = 10 }: Props) {
             </tr>
           </thead>
           <tbody>
-            {payouts.map(p => (
+            {data?.items.map(p => (
               <tr key={p.id} className="border-t">
                 <td className="p-3 whitespace-nowrap">
                   {new Date(p.createdAt).toLocaleString()}
                 </td>
                 <td className="p-3 capitalize">{p.type}</td>
                 <td className="p-3">${p.amount.toFixed(2)}</td>
                 <td className="p-3">
-                  {p.userEmail ? (
+                  {p.user?.email ? (
                     <div className="flex flex-col">
-                      <span>{p.userName ?? '—'}</span>
+                      <span>{p.user.name ?? '—'}</span>
                       <span className="text-muted-foreground">
-                        {p.userEmail}
+                        {p.user.email}
                       </span>
                     </div>
                   ) : (
                     '—'
                   )}
                 </td>
-                <td className="p-3">{p.echoAppName ?? '—'}</td>
+                <td className="p-3">{p.echoApp?.name ?? '—'}</td>
                 <td className="p-3">
-                  {p.recipientGithubUrl ? (
+                  {p.recipientGithubLink?.githubUrl ? (
                     <a
-                      href={p.recipientGithubUrl}
+                      href={p.recipientGithubLink.githubUrl}
                       target="_blank"
                       rel="noreferrer"
                       className="text-primary underline"
                     >
                       GitHub Link
                     </a>
                   ) : (
-                    (p.recipientAddress ?? '—')
+                    (p.recipientGithubLink?.githubUrl ?? '—')
                   )}
                 </td>
                 <td className="p-3">

packages/app/control/src/app/(app)/admin/_components/pendingPayouts.tsx

@@ -11,7 +11,7 @@ export function PendingPayoutsTable({ pageSize = 10 }: Props) {
   const [page, setPage] = useState(0);
 
   const { data, isLoading, refetch, isFetching } =
-    api.admin.payouts.listPending.useQuery({
+    api.admin.payouts.list.pending.useQuery({
       cursor: page,
       page_size: pageSize,
     });
@@ -38,18 +38,6 @@ export function PendingPayoutsTable({ pageSize = 10 }: Props) {
 
   if (isLoading) return <div>Loading pending payouts...</div>;
 
-  const payouts = (data?.items ?? []) as Array<{
-    id: string;
-    amount: number;
-    createdAt: string;
-    type: string;
-    userEmail: string | null;
-    userName: string | null;
-    echoAppName: string | null;
-    recipientGithubUrl: string | null;
-    recipientAddress: string | null;
-  }>;
-
   return (
     <div className="space-y-4">
       <div className="flex items-center justify-between">
@@ -84,38 +72,38 @@ export function PendingPayoutsTable({ pageSize = 10 }: Props) {
             </tr>
           </thead>
           <tbody>
-            {payouts.map(p => (
+            {data?.items.map(p => (
               <tr key={p.id} className="border-t">
                 <td className="p-3 whitespace-nowrap">
                   {new Date(p.createdAt).toLocaleString()}
                 </td>
                 <td className="p-3 capitalize">{p.type}</td>
                 <td className="p-3">${p.amount.toFixed(2)}</td>
                 <td className="p-3">
-                  {p.userEmail ? (
+                  {p.user?.email ? (
                     <div className="flex flex-col">
-                      <span>{p.userName ?? '—'}</span>
+                      <span>{p.user.name ?? '—'}</span>
                       <span className="text-muted-foreground">
-                        {p.userEmail}
+                        {p.user.email}
                       </span>
                     </div>
                   ) : (
                     '—'
                   )}
                 </td>
-                <td className="p-3">{p.echoAppName ?? '—'}</td>
+                <td className="p-3">{p.echoApp?.name ?? '—'}</td>
                 <td className="p-3">
-                  {p.recipientGithubUrl ? (
+                  {p.recipientGithubLink?.githubUrl ? (
                     <a
-                      href={p.recipientGithubUrl}
+                      href={p.recipientGithubLink.githubUrl}
                       target="_blank"
                       rel="noreferrer"
                       className="text-primary underline"
                     >
                       GitHub Link
                     </a>
                   ) : (
-                    (p.recipientAddress ?? '—')
+                    (p.recipientGithubLink?.githubUrl ?? '—')
                   )}
                 </td>
                 <td className="p-3">

packages/app/control/src/app/(app)/admin/credit-grants/[code]/(code)/_components/edit-form.tsx

@@ -7,7 +7,7 @@ import { toast } from 'sonner';
 import type { RouterOutputs } from '@/trpc/client';
 import { api } from '@/trpc/client';
 
-import type { adminCreateCreditGrantSchema } from '@/services/admin/schemas';
+import type { adminCreateCreditGrantSchema } from '@/services/db/admin/schemas';
 import { CreditGrantForm } from '../../../_components/form';
 import { revalidateCodePage } from '../_actions/revalidate';