develop #3

Merged
behnam merged 39 commits from develop into main 2024-11-26 15:47:00 +00:00
14 changed files with 109 additions and 65 deletions
Showing only changes of commit 6f54fa0c67 - Show all commits

View File

@ -1,5 +1,5 @@
import fetchCustomerInvoicesUsecase from "@/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices-usecase";
export default function latestInvoicesController() {
return fetchCustomerInvoicesUsecase()
export default async function latestInvoicesController() {
return await fetchCustomerInvoicesUsecase()
}

View File

@ -2,12 +2,15 @@ import CreateRandomInvoiceContainer from '@/app/dashboard/components/client/crea
import latestInvoicesController from '@/app/dashboard/components/server/latest-invoices/latest-invoices-controller';
import { ArrowPathIcon } from '@heroicons/react/24/outline';
import clsx from 'clsx';
import { isLeft } from 'fp-ts/lib/Either';
import Image from 'next/image';
export default async function LatestInvoices() {
const latestInvoices = await latestInvoicesController();
const invoices = latestInvoices.map((invoice, i) => {
if (isLeft(latestInvoices)) return <div>Error</div>
const invoices = latestInvoices.right.map((invoice, i) => {
return (
<div
key={invoice.id}

View File

@ -4,7 +4,7 @@ import { makeFailureMessage } from "@/feature/common/failures/failure-helpers";
* This is a class called BaseFailure that extends the Error class. It is
* used as a base class for creating custom failure classes.
*/
export default abstract class BaseFailure {
export default abstract class BaseFailure<META_DATA> {
/* ------------------------------- Attributes ------------------------------- */
private readonly BASE_FAILURE_MESSAGE = "failure";
@ -15,8 +15,12 @@ export default abstract class BaseFailure {
message = this.BASE_FAILURE_MESSAGE;
/* -------------------------------------------------------------------------- */
constructor(key: string) {
metadata: META_DATA | undefined;
/* -------------------------------------------------------------------------- */
constructor(key: string, metadata?: META_DATA) {
this.message = makeFailureMessage(this.message, key);
this.metadata = metadata ?? undefined
}
/* -------------------------------------------------------------------------- */
}

View File

@ -3,10 +3,10 @@ import BaseDevFailure from "@/feature/common/failures/dev/base-dev-failure";
/**
* Failure for needed arguments in a method but sent wrong one
*/
export default class ArgumentsFailure extends BaseDevFailure {
export default class ArgumentsFailure<META_DATA> extends BaseDevFailure<META_DATA> {
/* ------------------------------- Constructor ------------------------------ */
constructor() {
super("arguments");
constructor(metadata?: META_DATA) {
super("arguments", metadata);
}
/* -------------------------------------------------------------------------- */
}

View File

@ -1,3 +1,3 @@
import BaseFailure from "@/feature/common/failures/base-failure";
export default abstract class BaseDevFailure extends BaseFailure {}
export default abstract class BaseDevFailure<META_DATA> extends BaseFailure<META_DATA> {}

View File

@ -3,8 +3,8 @@ import BaseDevFailure from "@/feature/common/failures/dev/base-dev-failure";
/**
* This is a failure of not having specific dependency
*/
export default class DependencyFailure extends BaseDevFailure {
constructor() {
super("DependencyFailure");
export default class DependencyFailure<META_DATA> extends BaseDevFailure<META_DATA> {
constructor(metadata: META_DATA) {
super("DependencyFailure", metadata);
}
}

View File

@ -3,10 +3,10 @@ import BaseFailure from "./base-failure";
/**
* Failure for HTTP response when response dosn't have base structure
*/
export default class NetworkFailure extends BaseFailure {
export default class NetworkFailure<META_DATA> extends BaseFailure<META_DATA> {
/* ------------------------------- Constructor ------------------------------ */
constructor() {
super("network");
constructor(metaData?: META_DATA) {
super("network", metaData);
}
/* -------------------------------------------------------------------------- */
}

View File

@ -0,0 +1,12 @@
import BaseFailure from "./base-failure";
/**
* Failure for params failure
*/
export default class ParamsFailure<META_DATA> extends BaseFailure<META_DATA> {
/* ------------------------------- Constructor ------------------------------ */
constructor(metadata?: META_DATA) {
super("params", metadata);
}
/* -------------------------------------------------------------------------- */
}

View File

@ -1,7 +1,12 @@
import { sql } from "@/bootstrap/boundaries/db/db";
import ApiTask from "@/feature/common/data/api-task";
import { failureOr } from "@/feature/common/failures/failure-helpers";
import NetworkFailure from "@/feature/common/failures/network-failure";
import { formatCurrency } from "@/feature/common/feature-helpers";
import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice";
import CustomerInvoiceRepo from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo";
import { pipe } from "fp-ts/lib/function";
import { tryCatch } from "fp-ts/lib/TaskEither";
import postgres from "postgres";
type customerInvoiceDbResponse = {
@ -13,22 +18,23 @@ type customerInvoiceDbResponse = {
}
export default class CustomerInvoiceDbRepo implements CustomerInvoiceRepo {
async fetchList(): Promise<CustomerInvoice[]> {
try {
const data = await sql`
fetchList(): ApiTask<CustomerInvoice[]> {
return pipe(
tryCatch(
async () => {
const response = await sql`
SELECT invoices.amount, customers.name, customers.image_url, customers.email, invoices.id
FROM invoices
JOIN customers ON invoices.customer_id = customers.id
ORDER BY invoices.date DESC
LIMIT 20 ` as postgres.RowList<customerInvoiceDbResponse[]>;
return this.customerInvoicesDto(data)
} catch (error) {
console.error('Database Error:', error);
throw new Error('Failed to fetch the latest invoices.');
return this.customerInvoicesDto(response)
},
(l) => failureOr(l, new NetworkFailure())
)
)
}
}
private customerInvoicesDto(dbCustomers: customerInvoiceDbResponse[]): CustomerInvoice[] {
return dbCustomers.map((customer) => this.customerInvoiceDto(customer));

View File

@ -1,7 +1,8 @@
import ApiTask from "@/feature/common/data/api-task"
import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice"
export default interface CustomerInvoiceRepo {
fetchList(): Promise<CustomerInvoice[]>
fetchList(): ApiTask<CustomerInvoice[]>
}
export const customerInvoiceRepoKey = "customerInvoiceRepoKey"

View File

@ -1,12 +1,12 @@
"use server"
import { ApiEither } from "@/feature/common/data/api-task";
import serverDi from "@/feature/common/server-di";
import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice";
import CustomerInvoiceRepo, { customerInvoiceRepoKey } from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo";
import { customerInvoiceModuleKey } from "@/feature/core/customer-invoice/invoice-module-key";
import { connection } from "next/server";
export default async function fetchCustomerInvoicesUsecase(): Promise<CustomerInvoice[]> {
export default async function fetchCustomerInvoicesUsecase(): Promise<ApiEither<CustomerInvoice[]>> {
connection()
const repo = serverDi(customerInvoiceModuleKey).resolve<CustomerInvoiceRepo>(customerInvoiceRepoKey)
return repo.fetchList()
return repo.fetchList()()
}

View File

@ -1,8 +1,13 @@
import { sql } from "@/bootstrap/boundaries/db/db";
import ApiTask from "@/feature/common/data/api-task";
import { failureOr } from "@/feature/common/failures/failure-helpers";
import NetworkFailure from "@/feature/common/failures/network-failure";
import { formatCurrency } from "@/feature/common/feature-helpers";
import InvoiceRepo from "@/feature/core/invoice/domain/i-repo/invoice-repo";
import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice-param";
import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status";
import { pipe } from "fp-ts/lib/function";
import { tryCatch } from "fp-ts/lib/TaskEither";
import postgres from "postgres";
type InvoiceSummaryDbResponse = {paid: string, pending: string}
@ -13,7 +18,10 @@ export default class InvoiceDbRepo implements InvoiceRepo {
return data.count ?? 0
}
async createInvoice(params: InvoiceParam): Promise<string> {
createInvoice(params: InvoiceParam): ApiTask<string> {
return pipe(
tryCatch(
async () => {
const firstCustomerIdDb = await sql`SELECT
id FROM customers
ORDER BY id DESC
@ -33,6 +41,10 @@ export default class InvoiceDbRepo implements InvoiceRepo {
RETURNING id
`;
return result.at(0)?.id ?? ""
},
(l) => failureOr(l, new NetworkFailure(l as Error))
),
)
}
async fetchInvoicesStatusSummary(): Promise<InvoiceStatusSummary> {

View File

@ -1,10 +1,11 @@
import ApiTask from "@/feature/common/data/api-task"
import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice-param"
import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status"
export default interface InvoiceRepo {
fetchAllInvoicesAmount(): Promise<number>
fetchInvoicesStatusSummary(): Promise<InvoiceStatusSummary>
createInvoice(params: InvoiceParam): Promise<string>
createInvoice(params: InvoiceParam): ApiTask<string>
}
export const invoiceRepoKey = "invoiceRepoKey"

View File

@ -1,19 +1,24 @@
"use server"
import { ApiEither } from "@/feature/common/data/api-task";
import ParamsFailure from "@/feature/common/failures/params-failure";
import serverDi from "@/feature/common/server-di";
import InvoiceRepo, { invoiceRepoKey } from "@/feature/core/invoice/domain/i-repo/invoice-repo";
import { InvoiceParam, invoiceSchema } from "@/feature/core/invoice/domain/param/invoice-param";
import { invoiceModuleKey } from "@/feature/core/invoice/invoice-module-key";
import { pipe } from "fp-ts/lib/function";
import { chain, fromNullable, left, map, right } from "fp-ts/lib/TaskEither";
export default async function createInvoiceUsecase(params: InvoiceParam): Promise<string | {errorMessage: string}> {
const isParamsValid = invoiceSchema.safeParse(params)
if (!isParamsValid) {
return {
errorMessage: "Please pass correct params"
}
}
export default async function createInvoiceUsecase(params: InvoiceParam): Promise<ApiEither<string>> {
const repo = serverDi(invoiceModuleKey).resolve<InvoiceRepo>(invoiceRepoKey)
return repo.createInvoice(params)
return pipe(
fromNullable(new ParamsFailure())(params),
map((params) => invoiceSchema.safeParse(params)),
chain((params) => {
const isParamsValid = invoiceSchema.safeParse(params)
if (!isParamsValid.success) left(new ParamsFailure())
return right(params.data as InvoiceParam)
}),
chain((params) => repo.createInvoice(params))
)()
}