Skip to content

Commit

Permalink
fix: workflow & address lookup fetchNames
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemmmy committed Jun 17, 2024
1 parent 3658057 commit dc2d733
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
container: node:16
container: node:20

services:
mariadb:
Expand All @@ -30,10 +30,10 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
run: npm install --legacy-peer-deps
run: pnpm install --frozen-lockfile

- name: Run tests
run: npm test
run: pnpm run test
env:
DB_HOST: mariadb
DB_PORT: ${{ job.services.mariadb.ports[3306] }}
Expand Down
13 changes: 10 additions & 3 deletions src/krist/addresses/lookup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,32 @@

import { QueryTypes, sql } from "@sequelize/core";
import { Address, db } from "../../database/index.js";
import { AddressWithNames } from "./index.js";

export async function lookupAddresses(
addressList: string[],
fetchNames?: boolean
): Promise<Address[]> {
if (fetchNames) {
return db.query(sql`
const rows: AddressWithNames[] = await db.query(sql`
SELECT
\`addresses\`.*,
COUNT(\`names\`.\`id\`) AS \`names\`
FROM \`addresses\`
LEFT JOIN \`names\` ON \`addresses\`.\`address\` = \`names\`.\`owner\`
WHERE \`addresses\`.\`address\` IN (:addresses)
WHERE \`addresses\`.\`address\` IN :addresses
GROUP BY \`addresses\`.\`address\`
ORDER BY \`names\` DESC
`, {
replacements: { addresses: addressList },
replacements: { addresses: sql.list(addressList) },
type: QueryTypes.SELECT
});

return rows.map(row => {
row.firstseen = new Date(row.firstseen);
row.names = Number(row.names);
return row;
});
} else {
return Address.findAll({ where: { address: addressList } });
}
Expand Down

0 comments on commit dc2d733

Please sign in to comment.