From a74f5028af05f52167ce118fa343ac50538d17b7 Mon Sep 17 00:00:00 2001
From: Keita Kobayashi <keita@kbys.me>
Date: Thu, 19 Dec 2024 17:26:39 +0900
Subject: [PATCH 1/2] Add all-id test

---
 jest.config.js      |  3 +-
 package.json        |  3 +-
 src/all-ids.test.ts | 91 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 src/all-ids.test.ts

diff --git a/jest.config.js b/jest.config.js
index cd57cd4..ee13ef0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,7 +10,8 @@ module.exports = {
     "bin",
     "__tests__",
     "ipc.test.ts",
-    "addresses.test.ts"
+    "addresses.test.ts",
+    "all-ids.test.ts",
   ],
   testEnvironment: "node"
 };
diff --git a/package.json b/package.json
index 2637355..1b121e1 100644
--- a/package.json
+++ b/package.json
@@ -39,10 +39,11 @@
   },
   "scripts": {
     "preinstall": "npx only-allow yarn",
-    "pretest": "docker rm -f prop-id-api__dynamodb-local &>/dev/null && sleep 1 && docker run -d -p 8000:8000 --rm --name prop-id-api__dynamodb-local amazon/dynamodb-local",
+    "pretest": "docker rm -f prop-id-api__dynamodb-local &>/dev/null && sleep 1 && docker run -d -p 8000:8000 --rm --name prop-id-api__dynamodb-local amazon/dynamodb-local -jar DynamoDBLocal.jar -inMemory -sharedDb",
     "test": "jest",
     "posttest": "docker stop prop-id-api__dynamodb-local || true",
     "test:ipc": "jest ./src/__tests__/ipc.test.ts",
+    "test:all-ids": "yarn pretest && jest --testPathIgnorePatterns=\"bin __tests__\" -- ./src/all-ids.test.ts && yarn posttest",
     "test:addresses": "node ./src/test_download-data.js && jest ./src/addresses.test.ts",
     "lint": "eslint --ext .ts --ext .js src --cache",
     "build": "tsc",
diff --git a/src/all-ids.test.ts b/src/all-ids.test.ts
new file mode 100644
index 0000000..24403ec
--- /dev/null
+++ b/src/all-ids.test.ts
@@ -0,0 +1,91 @@
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+import async from 'async'
+
+import { DB } from './lib/dynamodb';
+
+import { _handler } from './public';
+import { APIGatewayProxyResult } from 'aws-lambda';
+import { decorate, logger, authenticator } from './lib/decorators';
+
+const handler = decorate(_handler, [logger, authenticator('id-req')]);
+
+
+const allIds = fs.readFileSync(path.join(__dirname, '..', 'out', 'all-ids.csv'), {
+  encoding: 'utf-8',
+}).split(/\n/).map((line) => line.trim().split(','));
+
+beforeAll(async () => {
+  const queue = async.cargoQueue<Record<string, any>>(async (records) => {
+    // console.timeLog('loading IDs', `writing ${records.length} records...`);
+    const resp = await DB.batchWrite({
+      RequestItems: {
+        [process.env.AWS_DYNAMODB_ESTATE_ID_TABLE_NAME]: records.map((record) => ({
+          PutRequest: {
+            Item: record,
+          },
+        })),
+      }
+    }).promise();
+    const unprocessed = (resp.UnprocessedItems || {})[process.env.AWS_DYNAMODB_ESTATE_ID_TABLE_NAME] || [];
+    if (unprocessed.length > 0) {
+      console.error('unprocessed items', unprocessed);
+      throw new Error('unprocessed items');
+    }
+  }, 2, 25);
+  queue.error();
+
+  for (const row of allIds) {
+    const [id,_min_createat,_max_createat,_cnt,address,rawAddress] = row;
+    queue.push({
+      estateId: id,
+      address,
+      rawAddress,
+      zoom: 22,
+      serial: 1,
+    });
+  }
+  let progressTimer: NodeJS.Timeout | null = null;
+  (() => {
+    let lastLength = queue.length();
+    let lastTS = process.hrtime.bigint();
+    const logger = () => {
+      const length = queue.length();
+      if (length === 0) {
+        return;
+      }
+      let progress = lastLength - length;
+      const nowTS = process.hrtime.bigint();
+      const elapsed = nowTS - lastTS;
+      const perSecond = progress / Number(elapsed) * 1e9;
+      const timeRemaining = length / perSecond;
+      console.log(`queue length: ${length}, progress: ${progress} (${perSecond.toFixed(2)}/s, ${timeRemaining.toFixed(2)}s remaining)`);
+
+      lastLength = length;
+      lastTS = nowTS;
+      progressTimer = setTimeout(logger, 10_000);
+    };
+    logger();
+  })();
+  await queue.drain();
+  if (progressTimer) {
+    // clear the timeout so jest doesn't complain
+    clearTimeout(progressTimer);
+  }
+}, 60_000 * 10); // give us 10 minutes to load the data
+
+for (const row of allIds) {
+  test(`${row[0]} - ${row[5]} (ID発行)`, async () => {
+    const event = {
+      isDemoMode: true,
+      queryStringParameters: {
+        q: row[5],
+      },
+    };
+    // @ts-expect-error context and callback are not used
+    const lambdaResult = await handler(event) as APIGatewayProxyResult
+    const body = JSON.parse(lambdaResult.body)
+    expect(body[0].ID).toEqual(row[0]);
+  });
+}

From 661ed4130941c02ff4b14e0425a9580da8710cd4 Mon Sep 17 00:00:00 2001
From: Keita Kobayashi <keita@kbys.me>
Date: Mon, 23 Dec 2024 13:10:31 +0900
Subject: [PATCH 2/2] Quote address field

---
 bin/estate-id-create-list.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/estate-id-create-list.ts b/bin/estate-id-create-list.ts
index 426e0d7..2f7492c 100644
--- a/bin/estate-id-create-list.ts
+++ b/bin/estate-id-create-list.ts
@@ -79,7 +79,7 @@ export async function main(argv: string[]) {
   const idOutputQueue = async.queue<string>(async (id) => {
     const {min_createat, max_createat, cnt} = idStats.get(id)!;
     const {address, rawAddress} = idAttributes.get(id)!;
-    await out.write(`${id},${min_createat},${max_createat},${cnt},${address},${rawAddress}\n`);
+    await out.write(`${id},${min_createat},${max_createat},${cnt},"${address}","${rawAddress}"\n`);
     idStats.delete(id);
     idAttributes.delete(id);
   }, 1)