feat: edit transaction

__tests__/functions/calculateMonthlyReportData.test.ts

@@ -19,6 +19,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Monthly Salary',
         amount: '1000',
         isIncome: true,
+        isEdited: false,
         balance: '1000',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -39,6 +40,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Weekly groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -66,6 +68,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -83,6 +86,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Bus fare',
         amount: '100',
         isIncome: false,
+        isEdited: false,
         balance: '700',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -100,6 +104,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'More groceries',
         amount: '150',
         isIncome: false,
+        isEdited: false,
         balance: '550',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -130,6 +135,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Monthly Salary',
         amount: '1000',
         isIncome: true,
+        isEdited: false,
         balance: '1000',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -160,6 +166,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -186,6 +193,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Monthly Salary',
         amount: '1000',
         isIncome: true,
+        isEdited: false,
         balance: '1000',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -206,6 +214,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -232,6 +241,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Monthly Salary',
         amount: '1000',
         isIncome: true,
+        isEdited: false,
         balance: '1000',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -252,6 +262,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -278,6 +289,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Monthly Salary',
         amount: '1000',
         isIncome: true,
+        isEdited: false,
         balance: '1000',
         currency: {
           name: CURRENCY_NAME.UAH,
@@ -298,6 +310,7 @@ describe('calculateMonthlyReportData', () => {
         description: 'Groceries',
         amount: '200',
         isIncome: false,
+        isEdited: false,
         balance: '800',
         currency: {
           name: CURRENCY_NAME.UAH,

app/lib/actions.ts

@@ -164,13 +164,13 @@ export async function createTransaction(
   try {
     const newTransaction: Omit<
       TTransaction,
-      'createdAt' | 'updatedAt' | 'transactionLimit'
+      'createdAt' | 'updatedAt' | 'transactionLimit' | 'isEdited'
     > = {
       id: crypto.randomUUID(),
       userId,
       description: capitalizeFirstLetter(
         formData.get('description') as TTransaction['description'],
-      ),
+      ).trim(),
       amount: formData.get('amount') as TTransaction['amount'],
       category: getCategoryWithEmoji(
         formData.get('category'),
@@ -310,24 +310,58 @@ export async function getAllTransactions(
 }
 export const getCachedAllTransactions = cache(getAllTransactions)
 
-// export async function editTransaction(
-//   id: TTransaction['id'],
-//   updates: Partial<TTransaction>,
-// ): Promise<void> {
-//   if (!id) {
-//     throw new Error('Transaction ID is required to edit a transaction.')
-//   }
-//   if (!updates || Object.keys(updates).length === 0) {
-//     throw new Error('No updates provided.')
-//   }
-//   try {
-//     await dbConnect()
-//     await TransactionModel.updateOne({ id }, { $set: updates })
-//     revalidatePath(ROUTE.HOME)
-//   } catch (err) {
-//     throw err
-//   }
-// }
+export async function editTransactionById(
+  id: TTransaction['id'],
+  newTransactionData: Partial<TTransaction>,
+): Promise<void> {
+  if (!id) {
+    throw new Error('Transaction ID is required to update a transaction.')
+  }
+  try {
+    await dbConnect()
+    const session = await TransactionModel.startSession()
+    try {
+      session.startTransaction()
+      const updateFields: Partial<TTransaction> = {}
+      if (newTransactionData.description) {
+        updateFields.description = newTransactionData.description.trim()
+      }
+      if (newTransactionData.amount) {
+        updateFields.amount = newTransactionData.amount.replace(/\s/g, '')
+        const amount = parseFloat(updateFields.amount)
+        let balance = 0
+        if (newTransactionData.isIncome) {
+          balance += amount
+        } else {
+          balance -= amount
+        }
+        updateFields.balance = balance.toString()
+      }
+      if (newTransactionData.category) {
+        updateFields.category = newTransactionData.category
+      }
+      if (newTransactionData.currency) {
+        updateFields.currency = newTransactionData.currency
+      }
+      if (newTransactionData.isIncome !== undefined) {
+        updateFields.isIncome = newTransactionData.isIncome
+      }
+      if (newTransactionData.isEdited) {
+        updateFields.isEdited = newTransactionData.isEdited
+      }
+      await TransactionModel.updateOne({ id }, updateFields, { session })
+      await session.commitTransaction()
+      session.endSession()
+      revalidatePath(ROUTE.HOME)
+    } catch (err) {
+      await session.abortTransaction()
+      session.endSession()
+      throw err
+    }
+  } catch (err) {
+    throw err
+  }
+}
 
 export async function deleteTransaction(id: TTransaction['id']): Promise<void> {
   if (!id) {
@@ -342,6 +376,31 @@ export async function deleteTransaction(id: TTransaction['id']): Promise<void> {
   }
 }
 
+export async function findTransactionById(
+  id: TTransaction['id'],
+): Promise<TTransaction | null> {
+  if (!id) {
+    throw new Error(
+      'Transaction ID and User ID are required to find a transaction.',
+    )
+  }
+  try {
+    await dbConnect()
+    const transaction = await TransactionModel.findOne({
+      id,
+    }).lean<TTransaction>({
+      transform: (doc: TRawTransaction) => {
+        delete doc._id
+        delete doc.__v
+        return doc
+      },
+    })
+    return transaction
+  } catch (err) {
+    throw err
+  }
+}
+
 export async function deleteAllTransactionsAndSignOut(
   userId: TUserId,
 ): Promise<void> {

app/lib/models/transaction.model.ts

@@ -61,13 +61,15 @@ const transactionSchema = new Schema<TTransaction>(
       type: Number,
       default: null,
     },
+    isEdited: {
+      type: Boolean,
+      default: false,
+    },
   },
   {
     timestamps: true,
   },
-)
-
-transactionSchema.plugin(mongooseEncryptionDecryption, {
+).plugin(mongooseEncryptionDecryption, {
   encodedFields: ['amount', 'balance'],
   privateKey: process.env.ENCRYPTION_SECRET,
 })

app/lib/types.ts

@@ -31,6 +31,7 @@ export type TTransaction = {
       }
     | undefined
   transactionLimit: number | null | undefined
+  isEdited: boolean
   createdAt: Date
   updatedAt: Date
 }

app/lib/utils.ts

@@ -24,6 +24,10 @@ export const getEmojiFromCategory = (category: TTransaction['category']) => {
   return category.slice(0, 2)
 }
 
+export const getCategoryWithoutEmoji = (category: TTransaction['category']) => {
+  return category.slice(2).trim()
+}
+
 export const getSlicedCurrencyCode = (code: CURRENCY_CODE) => {
   return code.toLocaleLowerCase().slice(0, 2)
 }

app/not-found.tsx

@@ -8,7 +8,7 @@ export default function NotFound() {
   return (
     <main className='mx-auto flex h-screen max-w-md flex-col items-center justify-center gap-4 px-4 text-center xs:px-0'>
       <div className='flex flex-col items-center'>
-        <p className='text-default-300'>#404Error</p>
+        <p className='text-default-300'>#404NotFound</p>
       </div>
       <h1 className='text-lg font-medium'>
         Looks like this page got lost in the internet abyss. Do not worry, we

app/page.tsx

@@ -181,6 +181,7 @@ export default async function Home({
                       amount={transaction.amount}
                       currency={transaction.currency}
                       isIncome={transaction.isIncome}
+                      isEdited={transaction.isEdited}
                       createdAt={transaction.createdAt}
                     />
                   </li>

app/transaction/[id]/edit/not-found.tsx

@@ -0,0 +1,27 @@
+import Link from 'next/link'
+
+import { ROUTE } from '@/config/constants/routes'
+
+import ClientButton from '@/app/ui/default-button'
+import WithSidebar from '@/app/ui/sidebar/with-sidebar'
+
+export default function NotFound() {
+  const content = (
+    <main className='mx-auto flex h-screen max-w-md flex-col items-center justify-center gap-4 px-4 text-center xs:px-0'>
+      <div className='flex flex-col items-center'>
+        <p className='text-default-300'>#404NotFound</p>
+      </div>
+      <h1 className='text-lg font-medium'>
+        Could not find the requested transaction.
+      </h1>
+      <Link href={ROUTE.HOME}>
+        <ClientButton
+          title='Return home'
+          className='max-w-md bg-primary font-medium text-default-50'
+        />
+      </Link>
+    </main>
+  )
+
+  return <WithSidebar contentNearby={content} />
+}

app/transaction/[id]/edit/page.tsx

@@ -0,0 +1,31 @@
+import { Metadata } from 'next'
+import { notFound } from 'next/navigation'
+
+import { findTransactionById } from '@/app/lib/actions'
+
+import WithSidebar from '@/app/ui/sidebar/with-sidebar'
+import TransactionFormEdit from '@/app/ui/transaction-form-edit'
+
+const PAGE_TITLE = 'Edit Transaction'
+
+export const metadata: Metadata = {
+  title: PAGE_TITLE,
+}
+
+export default async function Page({ params }: { params: { id: string } }) {
+  const { id } = params
+  const transaction = await findTransactionById(id)
+
+  if (!transaction) {
+    notFound()
+  }
+
+  const content = (
+    <main className='mx-auto max-w-2xl'>
+      <h1 className='mb-8 text-center text-2xl font-bold'>{PAGE_TITLE}</h1>
+      <TransactionFormEdit transaction={transaction} />
+    </main>
+  )
+
+  return <WithSidebar contentNearby={content} />
+}

app/ui/settings/currency.tsx

@@ -115,7 +115,7 @@ function Currency({ userId, currency }: TProps) {
       await updateCurrency(userId, getCurrencyData(key as CURRENCY_NAME))
       toast.success('Currency updated.')
     } catch (err) {
-      toast.error('Error updating currency.')
+      toast.error('Failed to update currency.')
       throw err
     } finally {
       setIsLoading(false)

app/ui/settings/transaction-limit.tsx

@@ -73,7 +73,7 @@ function TransactionLimit({
       await updateTransactionLimit(userId, Number(key))
       toast.success('Transaction limit updated.')
     } catch (err) {
-      toast.error('Error updating transaction limit.')
+      toast.error('Failed to update transaction limit.')
       throw err
     } finally {
       setIsLoading(false)