Skip to content

Resolve network id locally when upserting addresses #1146

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.

Sign up for GitHub

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

Open
Klakurka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve network id locally when upserting addresses #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions services/addressService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Prisma, Address } from '@prisma/client'
import prisma from 'prisma-local/clientInstance'
import { RESPONSE_MESSAGES } from 'constants/index'
import { fetchAddressTransactions } from 'services/transactionService'
import { getNetworkFromSlug } from 'services/networkService'
import { getNetworkIdFromSlug } from 'services/networkService'

const addressWithTransactionAndNetwork = Prisma.validator<Prisma.AddressDefaultArgs>()({
include: { transactions: true, network: true }
Expand Down Expand Up @@ -206,15 +206,15 @@ export async function upsertAddress (
includeTransactions = false
): Promise<AddressWithTransactions> {
const prefix = addressString.split(':')[0].toLowerCase()
const network = await getNetworkFromSlug(prefix)
const networkId = getNetworkIdFromSlug(prefix)
const localPrisma = prismaTransaction ?? prisma
return await localPrisma.address.upsert({
where: {
address: addressString
},
create: {
address: addressString.toLowerCase(),
networkId: Number(network.id)
networkId
},
update: {
},
Expand Down
7 changes: 5 additions & 2 deletions tests/unittests/addressService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,13 @@ describe('Create by substring', () => {
it('Create single address', async () => {
prismaMock.address.upsert.mockResolvedValue(mockedBCHAddress)
prisma.address.upsert = prismaMock.address.upsert
prismaMock.network.findUnique.mockResolvedValue(mockedNetwork)
prisma.network.findUnique = prismaMock.network.findUnique

const result = await addressService.upsertAddress(mockedBCHAddress.address)
expect(result).toEqual(mockedBCHAddress)
expect(prismaMock.address.upsert).toHaveBeenCalledWith(expect.objectContaining({
create: expect.objectContaining({
networkId: mockedBCHAddress.networkId
})
}))
})
})
Loading