adjust main label on transaction item; store user email on transaction;

andreciornavei · Mar 8, 2024 · 8a58749 · 8a58749
1 parent adf1ff3
commit 8a58749
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 9 deletions.
diff --git a/backend/app/Domain/Entities/TransactionEntity.php b/backend/app/Domain/Entities/TransactionEntity.php
@@ -7,6 +7,7 @@ class TransactionEntity
 {
     private string $_id;
     private string $user_id;
+    private string $user_email;
     private string $user_username;
     private int $factor;
     private float $amount;
@@ -40,6 +41,11 @@ public function getUserId()
         return $this->user_id;
     }
 
+    public function getUserEmail()
+    {
+        return $this->user_email;
+    }
+
     public function getUserUsername()
     {
         return $this->user_username;

diff --git a/backend/app/Domain/Repositories/ICreateTransactionRepository/ICreateTransactionDto.php b/backend/app/Domain/Repositories/ICreateTransactionRepository/ICreateTransactionDto.php
@@ -5,13 +5,14 @@
 
 class ICreateTransactionDto
 {
-    private string $user_id;
-    private string $user_username;
-    private string $status;
-    private string | null $document;
-    private string $description;
-    private int $factor;
-    private float $amount;
+    private $user_id;
+    private $user_email;
+    private $user_username;
+    private $status;
+    private $document;
+    private $description;
+    private $factor;
+    private $amount;
 
     public function __construct(array $data)
     {
@@ -27,6 +28,11 @@ public function getUserId()
         return $this->user_id ?? null;
     }
 
+    public function getUserEmail()
+    {
+        return $this->user_email ?? null;
+    }
+
     public function getUserUsername()
     {
         return $this->user_username ?? null;

diff --git a/backend/app/Domain/Usecases/TransactionCreate/TransactionCreateDto.php b/backend/app/Domain/Usecases/TransactionCreate/TransactionCreateDto.php
@@ -9,6 +9,7 @@ class TransactionCreateDto
     private $amount;
     private $document;
     private $userId;
+    private $userEmail;
     private $userUsername;
     private $userBalance;
 
@@ -51,6 +52,11 @@ public function getUserId()
         return $this->userId ?? null;
     }
 
+    public function getUserEmail()
+    {
+        return $this->userEmail ?? null;
+    }
+
     public function getUserUsername()
     {
         return $this->userUsername ?? null;

diff --git a/backend/app/Domain/Usecases/TransactionCreate/TransactionCreateUseCase.php b/backend/app/Domain/Usecases/TransactionCreate/TransactionCreateUseCase.php
@@ -32,6 +32,7 @@ public function handler(TransactionCreateDto $dto): UserEntity | TransactionEnti
             'document' => $dto->getDocument(),
             'amount' => $dto->getAmount(),
             'user_id' => $dto->getUserId(),
+            'user_email' => $dto->getUserEmail(),
             'user_username' => $dto->getUserUsername(),
         ];
 
@@ -42,6 +43,7 @@ public function handler(TransactionCreateDto $dto): UserEntity | TransactionEnti
             ]),
             [
                 'user_id' => 'required|string',
+                'user_email' => 'required|string|email',
                 'user_username' => 'required|string',
                 'balance' => 'required|numeric',
                 'factor' => 'required|numeric|in:-1,1',

diff --git a/backend/app/Http/Controllers/TransactionCreateController.php b/backend/app/Http/Controllers/TransactionCreateController.php
@@ -36,6 +36,7 @@ public function handler(Request $request)
                 "amount" => $request->input("amount"),
                 "document" => $request->input("document"),
                 "userId" => $user->_id,
+                "userEmail" => $user->email,
                 "userUsername" => $user->username,
                 "userBalance" => $user->balance,
             ]));

diff --git a/backend/app/Infrastructure/Repositories/EloquentCreateTransactionRepository.php b/backend/app/Infrastructure/Repositories/EloquentCreateTransactionRepository.php
@@ -11,11 +11,13 @@ class EloquentCreateTransactionRepository implements ICreateTransactionRepositor
 {
     public function handler(ICreateTransactionDto $dto): TransactionEntity
     {
+
         $transaction = TransactionModel::create([
             'factor' => $dto->getFactor(),
             'amount' => $dto->getAmount(),
             'description' => $dto->getDescription(),
             'user_id' => $dto->getUserId(),
+            'user_email' => $dto->getUserEmail(),
             'user_username' => $dto->getUserUsername(),
             'document' => $dto->getDocument(),
             'status' => $dto->getStatus(),

diff --git a/backend/app/Models/TransactionModel.php b/backend/app/Models/TransactionModel.php
@@ -21,6 +21,7 @@ class TransactionModel extends Model
         'amount',
         'description',
         'user_id',
+        'user_email',
         'user_username',
         'document',
         'status',

diff --git a/frontend/src/components/item-transaction/index.tsx b/frontend/src/components/item-transaction/index.tsx
@@ -10,6 +10,7 @@ export const ItemTransaction = ({
   data,
   href,
   onClick,
+  labelField,
 }: ItemTransactionProps): JSX.Element => {
   const { palette } = useTheme()
   const navigate = useNavigate()
@@ -42,7 +43,7 @@ export const ItemTransaction = ({
                 : []
             }
           >
-            {data.description}
+            {data[labelField || 'description']}
           </Typography>
           <Typography
             variant="caption"

diff --git a/frontend/src/components/item-transaction/types.tsx b/frontend/src/components/item-transaction/types.tsx
@@ -5,4 +5,5 @@ export type ItemTransactionProps = {
   prevData?: TransactionEntity
   href?: string
   onClick?: (transaction: TransactionEntity) => void
+  labelField?: keyof TransactionEntity
 }
diff --git a/frontend/src/pages/depopsits_control/view.tsx b/frontend/src/pages/depopsits_control/view.tsx
@@ -21,7 +21,11 @@ export const DepositsControlPageView = (): JSX.Element => {
           loadingMessage="Loading pending checks..."
           itemKey={(item: TransactionEntity) => item._id}
           renderItem={(item: TransactionEntity) => (
-            <ItemTransaction data={item} href={`/deposits/${item._id}`} />
+            <ItemTransaction
+              data={item}
+              href={`/deposits/${item._id}`}
+              labelField="user_username"
+            />
           )}
           handleFetch={handleFindTransactions}
         />