Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(2589): soft delete unused asset #2699

Merged
merged 23 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 36 additions & 2 deletions localenv/mock-account-servicing-entity/generated/graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function (knex) {
return knex.schema.alterTable('assets', (table) => {
table.timestamp('deletedAt').nullable()
})
}

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function (knex) {
return knex.schema.alterTable('assets', (table) => {
table.dropColumn('deletedAt')
})
}
19 changes: 18 additions & 1 deletion packages/backend/src/asset/errors.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
export enum AssetError {
DuplicateAsset = 'DuplicateAsset',
UnknownAsset = 'UnknownAsset'
UnknownAsset = 'UnknownAsset',
InuseAsset = 'InuseAsset'
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
export const isAssetError = (o: any): o is AssetError =>
Object.values(AssetError).includes(o)

export const errorToCode: {
[key in AssetError]: number
} = {
[AssetError.UnknownAsset]: 404,
[AssetError.DuplicateAsset]: 400,
[AssetError.InuseAsset]: 400
}

export const errorToMessage: {
[key in AssetError]: string
} = {
[AssetError.UnknownAsset]: 'unknown asset',
[AssetError.DuplicateAsset]: 'Asset already exists',
[AssetError.InuseAsset]: 'Asset in use'
lengyel-arpad85 marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 2 additions & 0 deletions packages/backend/src/asset/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export class Asset extends BaseModel implements LiquidityAccount {

public readonly liquidityThreshold!: bigint | null

public readonly deletedAt!: string | null
lengyel-arpad85 marked this conversation as resolved.
Show resolved Hide resolved

public get asset(): LiquidityAccount['asset'] {
return {
id: this.id,
Expand Down
34 changes: 31 additions & 3 deletions packages/backend/src/asset/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@ export interface UpdateOptions {
withdrawalThreshold: bigint | null
liquidityThreshold: bigint | null
}
export interface DeleteOptions {
id: string
deletedAt: string
lengyel-arpad85 marked this conversation as resolved.
Show resolved Hide resolved
}

export interface AssetService {
create(options: CreateOptions): Promise<Asset | AssetError>
update(options: UpdateOptions): Promise<Asset | AssetError>
delete(options: DeleteOptions): Promise<Asset | AssetError>
get(id: string): Promise<void | Asset>
getPage(pagination?: Pagination, sortOrder?: SortOrder): Promise<Asset[]>
getAll(): Promise<Asset[]>
Expand All @@ -50,6 +55,7 @@ export async function createAssetService({
return {
create: (options) => createAsset(deps, options),
update: (options) => updateAsset(deps, options),
delete: (options) => deleteAsset(deps, options),
lengyel-arpad85 marked this conversation as resolved.
Show resolved Hide resolved
get: (id) => getAsset(deps, id),
getPage: (pagination?, sortOrder?) =>
getAssetsPage(deps, pagination, sortOrder),
Expand Down Expand Up @@ -111,21 +117,43 @@ async function updateAsset(
}
}

// soft delete
async function deleteAsset(
deps: ServiceDependencies,
{ id, deletedAt }: DeleteOptions
): Promise<Asset | AssetError> {
if (!deps.knex) {
throw new Error('Knex undefined')
}
try {
return await Asset.query(deps.knex)
.patchAndFetchById(id, { deletedAt })
.throwIfNotFound()
} catch (err) {
if (err instanceof NotFoundError) {
return AssetError.UnknownAsset
}
throw err
}
}

async function getAsset(
deps: ServiceDependencies,
id: string
): Promise<void | Asset> {
return await Asset.query(deps.knex).findById(id)
return await Asset.query(deps.knex).whereNull('deletedAt').findById(id)
}

async function getAssetsPage(
deps: ServiceDependencies,
pagination?: Pagination,
sortOrder?: SortOrder
): Promise<Asset[]> {
return await Asset.query(deps.knex).getPage(pagination, sortOrder)
return await Asset.query(deps.knex)
.whereNull('deletedAt')
.getPage(pagination, sortOrder)
}

async function getAll(deps: ServiceDependencies): Promise<Asset[]> {
return await Asset.query(deps.knex)
return await Asset.query(deps.knex).whereNull('deletedAt')
}
142 changes: 142 additions & 0 deletions packages/backend/src/graphql/generated/graphql.schema.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.