Changeset 87c9f1e for src


Ignore:
Timestamp:
02/27/25 00:42:38 (5 weeks ago)
Author:
Naum Shapkarovski <naumshapkarovski@…>
Branches:
main
Children:
32e9876
Parents:
3c5302a
Message:

update the seed script. update the prisma schema, use mapping

Location:
src
Files:
5 added
22 edited
8 moved

Legend:

Unmodified
Added
Removed

  • src/api/invoice.ts

    r3c5302a r87c9f1e  
    8181// Add this interface for the create invoice payload
    8282interface CreateInvoicePayload {
    83   createDate: Date;
     83  issueDate: Date;
    8484  dueDate: Date;
    8585  items: any[];

  • src/app/api/customers/route.ts

    r3c5302a r87c9f1e  
    33import prisma from 'src/lib/prisma';
    44import { authenticateRequest } from 'src/lib/auth-middleware';
    5 import { CustomerStatus } from '@prisma/client';
    6 import { Prisma } from '@prisma/client';
     5import { Prisma, ClientStatus } from '@prisma/client';
    76
    87export async function GET(request: NextRequest) {
    … …  
    2524    const validatedFilters = customerTableFiltersSchema.parse(filters);
    2625
    27     // Replace Prisma query with raw SQL
    28     const customers = await prisma.$queryRaw`
    29       SELECT * FROM "Client"
    30       WHERE "tenantId" = ${tenantId}
    31         AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`})
    32         ${
    33           validatedFilters.status
    34             ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"`
    35             : Prisma.sql`AND TRUE`
    36         }
    37     `;
     26    //   const customers = await prisma.$queryRaw`
     27    //   SELECT * FROM "Client"
     28    //   WHERE "tenant_id" = ${tenantId}
     29    //     AND LOWER(name) LIKE LOWER(${`%${validatedFilters.name}%`})
     30    //     ${
     31    //       validatedFilters.status
     32    //         ? Prisma.sql`AND status = ${validatedFilters.status}::"CustomerStatus"`
     33    //         : Prisma.sql`AND TRUE`
     34    //     }
     35    // `;
     36
     37    const customers = await prisma.client.findMany({
     38      where: {
     39        tenantId,
     40        name: {
     41          contains: validatedFilters.name,
     42          mode: 'insensitive',
     43        },
     44        ...(validatedFilters.status && {
     45          status: validatedFilters.status as ClientStatus,
     46        }),
     47      },
     48    });
    3849
    3950    return NextResponse.json(customers);
    … …  
    6071      data: {
    6172        ...validatedData,
    62         // userId,
    6373        tenantId,
    6474      },

  • src/app/api/invoices/[id]/route.ts

    r3c5302a r87c9f1e  
    100100        data: {
    101101          invoiceNumber: validation.data.invoiceNumber,
    102           createDate: validation.data.createDate,
     102          issueDate: validation.data.issueDate,
    103103          dueDate: validation.data.dueDate,
    104104          status: validation.data.status,

  • src/app/api/invoices/route.ts

    r3c5302a r87c9f1e  
    4545          ? { equals: validatedFilters.status as InvoiceStatus }
    4646          : undefined,
    47         createDate: {
     47        issueDate: {
    4848          ...(validatedFilters.startDate && { gte: validatedFilters.startDate }),
    4949          ...(validatedFilters.endDate && { lte: validatedFilters.endDate }),
    … …  
    108108        quantityType: validatedData.quantityType,
    109109        subTotal: validatedData.subTotal,
    110         createDate: validatedData.createDate,
     110        issueDate: validatedData.issueDate,
    111111        month: validatedData.month,
    112112        discount: validatedData.discount,

  • src/app/api/invoices/totals/route.ts

    r3c5302a r87c9f1e  
    2020    const searchParams = request.nextUrl.searchParams;
    2121    const startDate = searchParams.get('startDate')
    22       ? new Date(searchParams.get('startDate')!)
     22      ? new Date(searchParams.get('issueDate')!)
    2323      : null;
    2424
    … …  
    3232        status,
    3333        currency,
    34         SUM("totalAmount") as total
     34        SUM("total_amount") as total
    3535      FROM "Invoice"
    36       WHERE "createDate" >= ${startDate}
    37         AND "invoiceFromId" = ${tenantId}
     36      WHERE "issue_date" >= ${startDate}
     37        AND "tenant_id" = ${tenantId}
    3838      GROUP BY status, currency
    3939    `;

  • src/app/dashboard/customer/list/page.tsx

    r3c5302a r87c9f1e  
    11// sections
    2 import { CustomerListView } from 'src/sections/user/view';
     2import { CustomerListView } from 'src/sections/client/view';
    33
    44// ----------------------------------------------------------------------

  • src/app/dashboard/customer/new/page.tsx

    r3c5302a r87c9f1e  
    11// sections
    2 import { CustomerCreateView } from 'src/sections/user/view';
     2import { CustomerCreateView } from 'src/sections/client/view';
    33
    44// ----------------------------------------------------------------------

  • src/app/loading.tsx

    r3c5302a r87c9f1e  
    77
    88export default function Loading() {
    9   return <SplashScreen />;
     9  return (
     10    <div className="flex min-h-screen items-center justify-center">
     11      <div className="animate-spin rounded-full h-32 w-32 border-t-2 border-b-2 border-blue-500"></div>
     12    </div>
     13  );
    1014}

  • src/app/not-found.tsx

    r3c5302a r87c9f1e  
    11// sections
    22import { NotFoundView } from 'src/sections/error';
     3import Link from 'next/link';
    34
    45// ----------------------------------------------------------------------
    … …  
    89};
    910
    10 export default function NotFoundPage() {
    11   return <NotFoundView />;
     11export default function NotFound() {
     12  return (
     13    <div className="flex min-h-screen flex-col items-center justify-center">
     14      <h2 className="text-2xl font-bold mb-4">Page Not Found</h2>
     15      <p className="mb-4">Could not find requested resource</p>
     16      <Link href="/" className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600">
     17        Return Home
     18      </Link>
     19    </div>
     20  );
    1221}

  • src/auth/context/firebase/auth-provider.tsx

    r3c5302a r87c9f1e  
    2121import { AuthContext } from './auth-context';
    2222import { ActionMapType, AuthStateType, AuthUserType } from '../../types';
     23import { getUser } from 'src/api/user';
    2324
    2425// ----------------------------------------------------------------------
    … …  
    7172        if (user) {
    7273          if (user.emailVerified) {
    73             const userProfile = doc(db, collections.administrator, user.uid);
    74 
    75             const docSnap = await getDoc(userProfile);
    76 
    77             const profile = docSnap.data();
    78 
    79             dispatch({
    80               type: Types.INITIAL,
    81               payload: {
    82                 user: {
    83                   ...user,
    84                   ...profile,
    85                   id: user.uid,
     74            try {
     75              const profile = await getUser();
     76              console.log('profile', profile);
     77
     78              dispatch({
     79                type: Types.INITIAL,
     80                payload: {
     81                  user: { ...profile, emailVerified: user.emailVerified },
    8682                },
    87               },
    88             });
     83              });
     84            } catch (error) {
     85              console.error('Failed to fetch user profile:', error);
     86              dispatch({
     87                type: Types.INITIAL,
     88                payload: {
     89                  user: null,
     90                },
     91              });
     92            }
    8993          } else {
    9094            dispatch({
    … …  
    145149  const register = useCallback(
    146150    async (email: string, password: string, firstName: string, lastName: string) => {
    147       const newUser = await createUserWithEmailAndPassword(auth, email, password);
    148 
    149       await sendEmailVerification(newUser.user);
    150 
    151       const userProfile = doc(collection(db, collections.administrator), newUser.user?.uid);
    152 
    153       await setDoc(userProfile, {
    154         uid: newUser.user?.uid,
    155         email,
    156         displayName: `${firstName} ${lastName}`,
    157       });
     151      // const newUser = await createUserWithEmailAndPassword(auth, email, password);
     152      // await sendEmailVerification(newUser.user);
     153      // const userProfile = doc(collection(db, collections.administrator), newUser.user?.uid);
     154      // await setDoc(userProfile, {
     155      //   uid: newUser.user?.uid,
     156      //   email,
     157      //   displayName: `${firstName} ${lastName}`,
     158      // });
    158159    },
    159160    []

  • src/layouts/dashboard/nav-horizontal.tsx

    r3c5302a r87c9f1e  
    4141          data={navData}
    4242          config={{
    43             currentRole: user?.role || 'admin',
     43            currentRole: user?.role || 'ADMIN',
    4444          }}
    4545        />

  • src/layouts/dashboard/nav-mini.tsx

    r3c5302a r87c9f1e  
    5151          data={navData}
    5252          config={{
    53             currentRole: user?.role || 'admin',
     53            currentRole: user?.role || 'ADMIN',
    5454          }}
    5555        />

  • src/layouts/dashboard/nav-vertical.tsx

    r3c5302a r87c9f1e  
    5858        data={navData}
    5959        config={{
    60           currentRole: user?.role || 'admin',
     60          currentRole: user?.role || 'ADMIN',
    6161        }}
    6262      />

  • src/lib/auth-middleware.ts

    r3c5302a r87c9f1e  
    2121  try {
    2222    // Verify the token
    23     // const decodedToken = await auth.verifyIdToken(token);
    24     // const userId = decodedToken.uid;
    25     // const tenantId = decodedToken.customClaims?.tenantId || 'cm7lxc3p00000pb7kmdrxsfod';
     23    const decodedToken = await auth.verifyIdToken(token);
     24    const userId = decodedToken.uid;
    2625
    27     // if (!userId || !tenantId) {
    28     //   return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
    29     // }
     26    const tenantId = decodedToken.customClaims?.tenantId || 'cm7lxc3p00000pb7kmdrxsfod';
    3027
    31     return { userId: 'nlswimR6mMQtirTNlMeqhqcSZeD3', tenantId: 'cm7lxc3p00000pb7kmdrxsfod' };
     28    if (!userId || !tenantId) {
     29      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     30    }
     31
     32    return { userId, tenantId: 'cm7lxc3p00000pb7kmdrxsfod' };
    3233  } catch (error) {
     34    console.error('Error verifying token:', error);
    3335    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
    3436  }

  • src/schemas/invoice.ts

    r3c5302a r87c9f1e  
    6767  ]),
    6868  subTotal: z.number(),
    69   createDate: z.coerce.date(),
     69  issueDate: z.coerce.date(),
    7070  month: monthSchema,
    7171  discount: z.number().optional(),

  • src/sections/invoice/invoice-details.tsx

    r3c5302a r87c9f1e  
    261261              Date Issued
    262262            </Typography>
    263             {fDate(invoice.createDate)}
     263            {fDate(invoice.issueDate)}
    264264          </Stack>
    265265

  • src/sections/invoice/invoice-ee-pdf.tsx

    r3c5302a r87c9f1e  
    129129    discount,
    130130    invoiceTo,
    131     createDate,
     131    issueDate,
    132132    totalAmount,
    133133    invoiceFrom,
    … …  
    229229          <View style={styles.col6}>
    230230            <Text style={[styles.subtitle1, styles.mb4]}>Date Issued</Text>
    231             <Text style={styles.body2}>{fDate(createDate)}</Text>
     231            <Text style={styles.body2}>{fDate(issueDate)}</Text>
    232232          </View>
    233233          <View style={styles.col6}>

  • src/sections/invoice/invoice-mk-pdf.tsx

    r3c5302a r87c9f1e  
    113113    discount,
    114114    invoiceTo,
    115     createDate,
     115    issueDate,
    116116    totalAmount,
    117117    invoiceFrom,
    … …  
    179179          <View style={styles.col6}>
    180180            <Text style={[styles.subtitle1, styles.mb4]}>Date Issued</Text>
    181             <Text style={styles.body2}>{fDate(createDate)}</Text>
     181            <Text style={styles.body2}>{fDate(issueDate)}</Text>
    182182          </View>
    183183          <View style={styles.col6}>

  • src/sections/invoice/invoice-new-edit-form.tsx

    r3c5302a r87c9f1e  
    8181  const NewInvoiceSchema = Yup.object().shape({
    8282    invoiceNumber: Yup.string().nullable().required('Invoice number is required'),
    83     createDate: Yup.mixed<any>().nullable().required('Create date is required'),
     83    issueDate: Yup.mixed<any>().nullable().required('Create date is required'),
    8484    dueDate: Yup.mixed<any>()
    8585      .required('Due date is required')
    … …  
    8787        'date-min',
    8888        'Due date must be later than create date',
    89         (value, { parent }) => value.getTime() > parent.createDate.getTime()
     89        (value, { parent }) => value.getTime() > parent.issueDate.getTime()
    9090      ),
    9191    invoiceFrom: Yup.mixed<any>().nullable().required('Invoice from is required'),
    … …  
    117117          ? currentInvoice?.invoiceNumber
    118118          : incrementInvoiceNumber(tenant?.lastInvoiceNumber),
    119       createDate: currentInvoice?.createDate ? new Date(currentInvoice.createDate) : new Date(),
     119      issueDate: currentInvoice?.issueDate ? new Date(currentInvoice.issueDate) : new Date(),
    120120      dueDate: currentInvoice?.dueDate
    121121        ? new Date(currentInvoice.dueDate)
    … …  
    175175
    176176      // Ensure dates are valid Date objects
    177       const createDate =
    178         data.createDate instanceof Date ? data.createDate : new Date(data.createDate);
     177      const issueDate = data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate);
    179178      const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate);
    180179
    181180      const currentTime = new Date();
    182       createDate.setHours(
     181      issueDate.setHours(
    183182        currentTime.getHours(),
    184183        currentTime.getMinutes(),
    … …  
    197196        invoiceNumber: incrementInvoiceNumber(tenant?.lastInvoiceNumber),
    198197        status: 'draft',
    199         createDate,
     198        issueDate,
    200199        dueDate,
    201200        items: items.filter((item) => item.service !== null) as CreateInvoice['items'],
    … …  
    246245      if (currentInvoice) {
    247246        // Ensure dates are valid Date objects
    248         const createDate =
    249           data.createDate instanceof Date ? data.createDate : new Date(data.createDate);
     247        const issueDate =
     248          data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate);
    250249        const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate);
    251250
    … …  
    259258        const writeData = {
    260259          ...data,
    261           createDate,
     260          issueDate,
    262261          dueDate,
    263262          items,
    … …  
    312311
    313312        // Ensure dates are valid Date objects
    314         const createDate =
    315           data.createDate instanceof Date ? data.createDate : new Date(data.createDate);
     313        const issueDate =
     314          data.issueDate instanceof Date ? data.issueDate : new Date(data.issueDate);
    316315        const dueDate = data.dueDate instanceof Date ? data.dueDate : new Date(data.dueDate);
    317316
    … …  
    325324        const writeData = {
    326325          ...data,
    327           createDate,
     326          issueDate,
    328327          dueDate,
    329328          items,

  • src/sections/invoice/invoice-new-edit-status-date.tsx

    r3c5302a r87c9f1e  
    109109
    110110      <Controller
    111         name="createDate"
     111        name="issueDate"
    112112        control={control}
    113113        render={({ field, fieldState: { error } }) => (

  • src/sections/invoice/invoice-table-row.tsx

    r3c5302a r87c9f1e  
    5151    sent,
    5252    invoiceNumber,
    53     createDate,
     53    issueDate,
    5454    dueDate,
    5555    status,
    … …  
    6060  } = row;
    6161
    62   console.log(createDate);
     62  console.log(issueDate);
    6363
    6464  const confirmSend = useBoolean();
    … …  
    107107        <TableCell>
    108108          <ListItemText
    109             primary={format(new Date(createDate), 'dd MMM yyyy')}
    110             secondary={format(new Date(createDate), 'p')}
     109            primary={format(new Date(issueDate), 'dd MMM yyyy')}
     110            secondary={format(new Date(issueDate), 'p')}
    111111            primaryTypographyProps={{ typography: 'body2', noWrap: true }}
    112112            secondaryTypographyProps={{

  • src/sections/invoice/view/invoice-list-view.tsx

    r3c5302a r87c9f1e  
    5959  { id: 'currency', label: 'Currency' },
    6060  { id: 'invoicePeriod', label: 'Invoice Period' },
    61   { id: 'createDate', label: 'Create' },
     61  { id: 'issueDate', label: 'Create' },
    6262  { id: 'dueDate', label: 'Due' },
    6363  { id: 'sent', label: 'Sent', align: 'center' },
    … …  
    152152
    153153  const table = useTable({
    154     defaultOrderBy: 'createDate',
     154    defaultOrderBy: 'issueDate',
    155155    defaultOrder: 'desc',
    156156    defaultDense: true,
    … …  
    166166      collections.invoice,
    167167      JSON.stringify({
    168         where: [['createDate', '>=', filters.startDate]],
    169         orderBy: 'createDate',
     168        where: [['issueDate', '>=', filters.startDate]],
     169        orderBy: 'issueDate',
    170170        direction: 'desc',
    171171      }),
    … …  
    275275    async (invoice: Invoice) => {
    276276      const serializedParams = JSON.stringify({
    277         where: [['createDate', '>=', filters.startDate]],
    278         orderBy: 'createDate',
     277        where: [['issueDate', '>=', filters.startDate]],
     278        orderBy: 'issueDate',
    279279        direction: 'desc',
    280280      });
    … …  
    671671      inputData = inputData.filter(
    672672        (invoice) =>
    673           fTimestamp(invoice.createDate.getTime()) >= fTimestamp(startDate.getTime()) &&
    674           fTimestamp(invoice.createDate.getTime()) <= fTimestamp(endDate.getTime())
     673          fTimestamp(invoice.issueDate.getTime()) >= fTimestamp(startDate.getTime()) &&
     674          fTimestamp(invoice.issueDate.getTime()) <= fTimestamp(endDate.getTime())
    675675      );
    676676    }
Note: See TracChangeset for help on using the changeset viewer.