Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/offers/ValidOffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AccountsRepository, WalletsRepository } from "@services/mongoose"
import Ibex from "@services/ibex/client"
import { CashoutDetails, ValidationInputs } from "./types"
import ErpNext, { CashoutId } from "@services/frappe/ErpNext"
import { JournalEntryDraftError, CashoutSubmitError } from "@services/frappe/errors"
import { CashoutDraftError, CashoutSubmitError } from "@services/frappe/errors"
import { baseLogger } from "@services/logger"
import { IbexError } from "@services/ibex/errors"
import { Cashout } from "@config"
Expand Down Expand Up @@ -43,7 +43,7 @@ class ValidOffer extends Offer {

async execute(): Promise<InitiatedCashout | Error> {
const cashoutId = await ErpNext.draftCashout(this)
if (cashoutId instanceof JournalEntryDraftError) return cashoutId
if (cashoutId instanceof CashoutDraftError) return cashoutId

if (!Cashout.SkipPayment) {
const resp = await Ibex.payInvoice({
Expand Down
12 changes: 6 additions & 6 deletions src/services/frappe/ErpNext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import { recordExceptionInCurrentSpan } from "@services/tracing"
import axios, { isAxiosError } from "axios"

import {
JournalEntryDraftError,
CashoutDraftError,
CashoutSubmitError,
JournalEntryTitleError,
JournalEntryDeleteError,
UpgradeRequestCreateError,
UpgradeRequestQueryError,
Expand Down Expand Up @@ -47,13 +46,14 @@ class ErpNext {
this.headers = {
"Content-Type": "application/json",
"Authorization": `token ${creds.apiKey}:${creds.apiSecret}`,
"Host": sitename
"Host": sitename,
"Expect": ""
}
}

async draftCashout(offer: ValidOffer): Promise<CashoutId | JournalEntryDraftError> {
async draftCashout(offer: ValidOffer): Promise<CashoutId | CashoutDraftError> {
const party = offer.account.erpParty
if (!party) return new JournalEntryDraftError("Account missing erpParty field")
if (!party) return new CashoutDraftError("Account missing erpParty field")
const { payment, payout } = offer.details

try {
Expand All @@ -76,7 +76,7 @@ class ErpNext {
return response.data.data.name as CashoutId
} catch (err) {
baseLogger.error({ err }, "Error drafting Cashout in ERPNext")
return new JournalEntryDraftError(err)
return new CashoutDraftError(err)
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/services/frappe/errors.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { DomainError } from "@domain/shared"

export class ErpNextError extends DomainError {}
export class JournalEntryDraftError extends ErpNextError {}
export class JournalEntryTitleError extends JournalEntryDraftError {}
export class JournalEntrySubmitError extends ErpNextError {}
export class CashoutDraftError extends ErpNextError {}
export class CashoutSubmitError extends ErpNextError {}
export class JournalEntryDeleteError extends ErpNextError {}
export class UpgradeRequestCreateError extends ErpNextError {}
Expand Down