feat: filter paid and unpaid transaction

mnindrazaka · mnindrazaka · commit b81c7eca87ff · 2024-12-27T13:16:25.000+07:00
diff --git a/apps/api/data/mysql/transactions/repository.go b/apps/api/data/mysql/transactions/repository.go
@@ -22,10 +22,10 @@ func (repo Repository) BeginTransaction(ctx context.Context, callback func(ctxWi
 	return utils.BeginDbTransaction(ctx, repo.db, callback)
 }
 
-func (repo Repository) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int) ([]transactions.Transaction, error) {
+func (repo Repository) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int, paymentStatus transactions.PaymentStatus) ([]transactions.Transaction, error) {
 	db := utils.GetDbFromCtx(ctx, repo.db)
 
-	var transactions []transactions.Transaction
+	var transactionResults []transactions.Transaction
 	result := db.Table("transactions").Where("deleted_at is NULL").Preload("TransactionItems").Preload("Wallet")
 
 	if sortBy != "" && order != "" {
@@ -44,12 +44,19 @@ func (repo Repository) GetTransactionList(ctx context.Context, query string, sor
 		result = result.Limit(limit)
 	}
 
-	result = result.Find(&transactions)
+	switch paymentStatus {
+	case transactions.Paid:
+		result = result.Where("paid_at IS NOT NULL")
+	case transactions.Unpaid:
+		result = result.Where("paid_at IS NULL")
+	}
+
+	result = result.Find(&transactionResults)
 
-	return transactions, result.Error
+	return transactionResults, result.Error
 }
 
-func (repo Repository) GetTransactionListTotal(ctx context.Context, query string) (int64, error) {
+func (repo Repository) GetTransactionListTotal(ctx context.Context, query string, paymentStatus transactions.PaymentStatus) (int64, error) {
 	db := utils.GetDbFromCtx(ctx, repo.db)
 	var count int64
 	result := db.Table("transactions").Where("deleted_at", nil)
@@ -58,6 +65,13 @@ func (repo Repository) GetTransactionListTotal(ctx context.Context, query string
 		result = result.Where("name LIKE ?", "%"+query+"%")
 	}
 
+	switch paymentStatus {
+	case transactions.Paid:
+		result = result.Where("paid_at IS NOT NULL")
+	case transactions.Unpaid:
+		result = result.Where("paid_at IS NULL")
+	}
+
 	result = result.Count(&count)
 
 	return count, result.Error
diff --git a/apps/api/domain/transactions/entity.go b/apps/api/domain/transactions/entity.go
@@ -48,3 +48,11 @@ type TransactionItemRequest struct {
 type TransactionPayRequest struct {
 	WalletId int64 `json:"walletId"`
 }
+
+type PaymentStatus int
+
+const (
+	Paid PaymentStatus = iota
+	Unpaid
+	All
+)
diff --git a/apps/api/domain/transactions/repository.go b/apps/api/domain/transactions/repository.go
@@ -7,8 +7,8 @@ import (
 
 type Repository interface {
 	BeginTransaction(ctx context.Context, callback func(ctxWithTx context.Context) error) error
-	GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int) ([]Transaction, error)
-	GetTransactionListTotal(ctx context.Context, query string) (int64, error)
+	GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int, paymentStatus PaymentStatus) ([]Transaction, error)
+	GetTransactionListTotal(ctx context.Context, query string, paymentStatus PaymentStatus) (int64, error)
 	GetTransactionById(ctx context.Context, id int64) (Transaction, error)
 	CreateTransaction(ctx context.Context, transaction *Transaction) error
 	UpdateTransactionById(ctx context.Context, transaction *Transaction, id int64) error
diff --git a/apps/api/domain/transactions/usecase.go b/apps/api/domain/transactions/usecase.go
@@ -25,13 +25,13 @@ func NewUsecase(repository Repository, productRepository products.Repository, wa
 	}
 }
 
-func (usecase Usecase) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int) ([]Transaction, int64, error) {
-	transactions, err := usecase.repository.GetTransactionList(ctx, query, sortBy, order, skip, limit)
+func (usecase Usecase) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int, paymentStatus PaymentStatus) ([]Transaction, int64, error) {
+	transactions, err := usecase.repository.GetTransactionList(ctx, query, sortBy, order, skip, limit, paymentStatus)
 	if err != nil {
 		return []Transaction{}, 0, err
 	}
 
-	total, err := usecase.repository.GetTransactionListTotal(ctx, query)
+	total, err := usecase.repository.GetTransactionListTotal(ctx, query, paymentStatus)
 	if err != nil {
 		return []Transaction{}, 0, err
 	}
diff --git a/apps/api/presentation/http/transactions/handler.go b/apps/api/presentation/http/transactions/handler.go
@@ -22,6 +22,7 @@ func (handler Handler) GetTransactionList(w http.ResponseWriter, r *http.Request
 	query := base.GetQuery(r)
 	sortBy := base.GetSortBy(r)
 	order := base.GetOrder(r)
+	paymentStatus := GetPaymentStatus(r)
 
 	skip, err := base.GetSkip(r)
 	if err != nil {
@@ -35,7 +36,7 @@ func (handler Handler) GetTransactionList(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	transactions, total, err := handler.usecase.GetTransactionList(ctx, query, sortBy, order, skip, limit)
+	transactions, total, err := handler.usecase.GetTransactionList(ctx, query, sortBy, order, skip, limit, paymentStatus)
 	if err != nil {
 		base.WriteError(w, apiContract.Error{Code: apiContract.SERVER_ERROR, Message: err.Error()})
 		return
@@ -160,7 +161,7 @@ func (handler Handler) GetTransactionStatistics(w http.ResponseWriter, r *http.R
 
 	apiTransactionStatistics := []apiContract.TransactionStatistic{}
 	for _, transactionStatistic := range transactionStatistics {
-		apiTransactionStatistics = append(apiTransactionStatistics, toApiTransactionStatistic(transactionStatistic))
+		apiTransactionStatistics = append(apiTransactionStatistics, ToApiTransactionStatistic(transactionStatistic))
 	}
 
 	json.NewEncoder(w).Encode(apiContract.TransactionStatistics200Response{Data: apiTransactionStatistics})
diff --git a/apps/api/presentation/http/transactions/transformer.go b/apps/api/presentation/http/transactions/transformer.go
@@ -30,6 +30,20 @@ func GetTransactionPayRequest(r *http.Request) (apiContract.TransactionPayReques
 	return transactionPayRequest, err
 }
 
+func GetPaymentStatus(r *http.Request) transactions.PaymentStatus {
+	paymentStatusQuery := r.URL.Query().Get("paymentStatus")
+	switch paymentStatusQuery {
+	case "paid":
+		return transactions.Paid
+	case "unpaid":
+		return transactions.Unpaid
+	case "all":
+		return transactions.All
+	default:
+		return transactions.All
+	}
+}
+
 func ToApiTransaction(transaction transactions.Transaction) apiContract.Transaction {
 	apiTransactionItems := []apiContract.TransactionItem{}
 	for _, item := range transaction.TransactionItems {
@@ -79,7 +93,7 @@ func ToTransactionPayRequest(transactionPayRequest apiContract.TransactionPayReq
 	}
 }
 
-func toApiTransactionStatistic(transactionStatistic transactions.TransactionStatistic) apiContract.TransactionStatistic {
+func ToApiTransactionStatistic(transactionStatistic transactions.TransactionStatistic) apiContract.TransactionStatistic {
 	return apiContract.TransactionStatistic{
 		Date:        transactionStatistic.Date,
 		Total:       transactionStatistic.Total,
diff --git a/libs/api-contract/src/api.yaml b/libs/api-contract/src/api.yaml
@@ -767,6 +767,7 @@ paths:
         - $ref: '#/components/parameters/Order'
         - $ref: '#/components/parameters/Limit'
         - $ref: '#/components/parameters/Skip'
+        - $ref: '#/components/parameters/PaymentStatus'
       responses:
         '200':
           description: success response
@@ -1685,3 +1686,9 @@ components:
       schema:
         type: integer
         format: int64
+    PaymentStatus:
+      name: paymentStatus
+      in: query
+      schema:
+        type: string
+        enum: [paid, unpaid, all]
diff --git a/libs/ui/src/data/api/transaction.ts b/libs/ui/src/data/api/transaction.ts
@@ -16,6 +16,7 @@ import {
   transactionStatistics,
   TransactionStatistic as ApiTransactionStatistic,
   TransactionStatistics200,
+  TransactionListQueryParams,
 } from '../../../../api-contract/src';
 import {
   Transaction,
@@ -33,13 +34,15 @@ export class OpenAPITransactionRepository implements TransactionRepository {
     orderBy: 'desc',
     query: '',
     sortBy: 'created_at',
+    paymentStatus: 'all',
   };
 
   transactionByIdServerParams: number | null = null;
 
   constructor(client: QueryClient) {
     this.client = client;
   }
+
   getTransactionListServerParams: TransactionRepository['getTransactionListServerParams'] =
     () => this.transactionListServerParams;
 
@@ -164,13 +167,15 @@ export class OpenAPITransactionRepository implements TransactionRepository {
     page,
     query,
     sortBy,
+    paymentStatus,
   }) => {
-    const params = {
+    const params: TransactionListQueryParams = {
       query,
       skip: (page - 1) * itemPerPage,
       limit: itemPerPage,
       order: orderBy,
       sortBy,
+      paymentStatus,
     };
     return this.client
       .fetchQuery({
diff --git a/libs/ui/src/domain/entities/Transaction.ts b/libs/ui/src/domain/entities/Transaction.ts
@@ -29,3 +29,5 @@ export type TransactionForm = {
   name: string;
   transactionItems: TransactionItemForm[];
 };
+
+export type PaymentStatus = 'paid' | 'unpaid' | 'all';
diff --git a/libs/ui/src/domain/repositories/transaction.ts b/libs/ui/src/domain/repositories/transaction.ts
@@ -1,4 +1,5 @@
 import {
+  PaymentStatus,
   Transaction,
   TransactionForm,
   TransactionStatistic,
@@ -10,6 +11,7 @@ export type TransactionListParams = {
   query: string;
   sortBy: 'created_at';
   orderBy: 'asc' | 'desc';
+  paymentStatus: PaymentStatus;
 };
 
 export interface TransactionRepository {
diff --git a/libs/ui/src/domain/usecases/transactionList.ts b/libs/ui/src/domain/usecases/transactionList.ts
@@ -1,5 +1,5 @@
 import { match, P } from 'ts-pattern';
-import { Transaction } from '../entities';
+import { PaymentStatus, Transaction } from '../entities';
 import { TransactionRepository } from '../repositories';
 import { createDebounce } from '../../utils';
 import { Usecase } from './IUsecase';
@@ -11,6 +11,7 @@ type Context = {
   errorMessage: string | null;
   sortBy: 'created_at';
   orderBy: 'asc' | 'desc';
+  paymentStatus: PaymentStatus;
   itemPerPage: number;
   totalItem: number;
   fetchDebounceDelay: number;
@@ -35,6 +36,7 @@ export type TransactionListAction =
       page?: number;
       query?: string;
       fetchDebounceDelay?: number;
+      paymentStatus?: PaymentStatus;
     }
   | { type: 'REVALIDATE'; transactions: Transaction[]; totalItem: number }
   | {
@@ -66,6 +68,7 @@ export class TransactionListUsecase extends Usecase<
       totalItem,
       page: initialParams.page,
       query: initialParams.query,
+      paymentStatus: 'all',
       errorMessage: null,
       sortBy: initialParams.sortBy,
       orderBy: initialParams.orderBy,
@@ -157,9 +160,16 @@ export class TransactionListUsecase extends Usecase<
       .with({ type: 'idle' }, () => dispatch({ type: 'FETCH' }))
       .with(
         { type: 'loading' },
-        ({ page, itemPerPage, orderBy, query, sortBy }) => {
+        ({ page, itemPerPage, orderBy, query, sortBy, paymentStatus }) => {
           this.repository
-            .fetchTransactionList({ page, itemPerPage, orderBy, query, sortBy })
+            .fetchTransactionList({
+              page,
+              itemPerPage,
+              orderBy,
+              query,
+              sortBy,
+              paymentStatus,
+            })
             .then(({ transactions, totalItem }) =>
               dispatch({ type: 'FETCH_SUCCESS', transactions, totalItem })
             )
@@ -173,7 +183,15 @@ export class TransactionListUsecase extends Usecase<
       )
       .with(
         { type: 'changingParams' },
-        ({ page, itemPerPage, orderBy, query, sortBy, fetchDebounceDelay }) => {
+        ({
+          page,
+          itemPerPage,
+          orderBy,
+          query,
+          sortBy,
+          fetchDebounceDelay,
+          paymentStatus,
+        }) => {
           changeParamsDebounce(() => {
             const { transactions, totalItem } =
               this.repository.getTransactionList({
@@ -182,6 +200,7 @@ export class TransactionListUsecase extends Usecase<
                 orderBy,
                 query,
                 sortBy,
+                paymentStatus,
               });
 
             if (transactions.length > 0) {
@@ -200,6 +219,7 @@ export class TransactionListUsecase extends Usecase<
           orderBy,
           query,
           sortBy,
+          paymentStatus,
           transactions,
           totalItem,
         }) => {
@@ -210,6 +230,7 @@ export class TransactionListUsecase extends Usecase<
               orderBy,
               query,
               sortBy,
+              paymentStatus,
             })
             .then(({ transactions, totalItem }) =>
               dispatch({ type: 'REVALIDATE_FINISH', transactions, totalItem })
diff --git a/libs/ui/src/presentation/components/transactions/TransactionList.tsx b/libs/ui/src/presentation/components/transactions/TransactionList.tsx
@@ -1,12 +1,15 @@
 import { EmptyView, ErrorView, LoadingView, Pagination } from '../base';
-import { Input, YStack } from 'tamagui';
+import { Input, Paragraph, ToggleGroup, XStack, YStack } from 'tamagui';
 import { FlatList } from 'react-native';
 import { TransactionListItem } from './TransactionListItem';
-import { Transaction } from '../../../domain';
+import { PaymentStatus, Transaction } from '../../../domain';
+import { Label } from 'tamagui';
 
 export type TransactionListProps = {
   searchValue: string;
   onSearchValueChange: (value: string) => void;
+  paymentStatus: PaymentStatus;
+  onPaymentStatusChange: (paymentStatus: PaymentStatus) => void;
   variant: { type: 'loading' } | { type: 'loaded' } | { type: 'error' };
   transactions: Transaction[];
   currentPage: number;
@@ -24,6 +27,8 @@ export type TransactionListProps = {
 export const TransactionList = ({
   searchValue,
   onSearchValueChange,
+  paymentStatus,
+  onPaymentStatusChange,
   variant,
   transactions,
   itemPerPage,
@@ -39,13 +44,36 @@ export const TransactionList = ({
 }: TransactionListProps) => {
   return (
     <YStack gap="$3" flex={1}>
-      <YStack>
+      <XStack gap="$3" $xs={{ flexDirection: 'column' }}>
         <Input
           placeholder="Search Transaction by Customer Name"
           value={searchValue}
           onChangeText={onSearchValueChange}
+          flex={1}
         />
-      </YStack>
+        <XStack gap="$3" $xs={{ flexDirection: 'column' }}>
+          <Label paddingRight="$0">Payment Status</Label>
+          {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+          {/* @ts-expect-error */}
+          <ToggleGroup
+            orientation="horizontal"
+            disableDeactivation
+            type="single"
+            value={paymentStatus}
+            onValueChange={onPaymentStatusChange}
+          >
+            <ToggleGroup.Item value="all" aria-label="all">
+              <Paragraph>All</Paragraph>
+            </ToggleGroup.Item>
+            <ToggleGroup.Item value="paid" aria-label="paid">
+              <Paragraph>Paid</Paragraph>
+            </ToggleGroup.Item>
+            <ToggleGroup.Item value="unpaid" aria-label="unpaid">
+              <Paragraph>Unpaid</Paragraph>
+            </ToggleGroup.Item>
+          </ToggleGroup>
+        </XStack>
+      </XStack>
       {variant.type === 'loading' ? (
         <LoadingView title="Fetching Transactions..." />
       ) : variant.type === 'loaded' ? (
diff --git a/libs/ui/src/presentation/controllers/TransactionListController.tsx b/libs/ui/src/presentation/controllers/TransactionListController.tsx

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ func NewUsecase(repository Repository, productRepository products.Repository, wa`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-func (usecase Usecase) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int) ([]Transaction, int64, error) {`
`29`		`- transactions, err := usecase.repository.GetTransactionList(ctx, query, sortBy, order, skip, limit)`
	`28`	`+func (usecase Usecase) GetTransactionList(ctx context.Context, query string, sortBy string, order string, skip int, limit int, paymentStatus PaymentStatus) ([]Transaction, int64, error) {`
	`29`	`+ transactions, err := usecase.repository.GetTransactionList(ctx, query, sortBy, order, skip, limit, paymentStatus)`
`30`	`30`	`if err != nil {`
`31`	`31`	`return []Transaction{}, 0, err`
`32`	`32`	`}`
`33`	`33`
`34`		`- total, err := usecase.repository.GetTransactionListTotal(ctx, query)`
	`34`	`+ total, err := usecase.repository.GetTransactionListTotal(ctx, query, paymentStatus)`
`35`	`35`	`if err != nil {`
`36`	`36`	`return []Transaction{}, 0, err`
`37`	`37`	`}`