Switch back to sqlite (#12)

Simple switch back to sqlite before we deploy the backend.

package.json

@@ -73,7 +73,8 @@
     "prom-client": "^14.2.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
-    "typeorm": "^0.3.17"
+    "sqlite3": "^5.1.7",
+    "typeorm": "^0.3.20"
   },
   "devDependencies": {
     "@eng-automation/js-style": "^2.3.0",

src/db/dataSource.ts

@@ -1,17 +1,11 @@
 import { DataSource } from "typeorm";
 
-import { config } from "src/config";
-
 import { Drip } from "./entity/Drip";
 import { migrations } from "./migration/migrations";
 
 export const AppDataSource = new DataSource({
-  type: "postgres",
-  host: config.Get("DB_HOST"),
-  port: config.Get("DB_PORT"),
-  username: config.Get("DB_USERNAME"),
-  password: config.Get("DB_PASSWORD"),
-  database: config.Get("DB_DATABASE_NAME"),
+  type: "sqlite",
+  database: "sqlite.db",
   synchronize: false,
   logging: ["error", "warn"],
   entities: [Drip],

src/db/entity/Drip.ts

@@ -3,10 +3,10 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from "typeorm";
 @Entity()
 export class Drip {
   @PrimaryGeneratedColumn()
-  id: number;
+  id: string;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
-  timestamp: string;
+  @Column({ type: "integer" })
+  timestamp: number;
 
   @Column({ nullable: true })
   @Index()

src/db/migration/1692350473907-initial.ts

@@ -5,7 +5,7 @@ export class Initial1692350473907 implements MigrationInterface {
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
-      `CREATE TABLE "drip" ("id" SERIAL NOT NULL, "timestamp" TIMESTAMP NOT NULL DEFAULT now(), "usernameSha256" character varying, "addressSha256" character varying NOT NULL, CONSTRAINT "PK_869cd028514a4d3cd3e359d3844" PRIMARY KEY ("id"))`,
+      `CREATE TABLE "drip" ("id" STRING NOT NULL, "timestamp" INTEGER NOT NULL, "usernameSha256" character varying, "addressSha256" character varying NOT NULL, CONSTRAINT "PK_869cd028514a4d3cd3e359d3844" PRIMARY KEY ("id"))`,
     );
     await queryRunner.query(`CREATE INDEX "IDX_94572562aeb9809c368c2a5db1" ON "drip" ("usernameSha256") `);
     await queryRunner.query(`CREATE INDEX "IDX_7d20734bce30abacefeed7dd4d" ON "drip" ("addressSha256") `);

src/dripper/dripperStorage.ts

@@ -1,4 +1,4 @@
-import crypto from "crypto";
+import crypto, { randomUUID } from "crypto";
 
 import { AppDataSource } from "src/db/dataSource";
 import { Drip } from "src/db/entity/Drip";
@@ -11,6 +11,8 @@ const dripRepository = AppDataSource.getRepository(Drip);
 
 export async function saveDrip(opts: { username?: string; addr: string }) {
   const freshDrip = new Drip();
+  freshDrip.id = randomUUID();
+  freshDrip.timestamp = Date.now();
   freshDrip.addressSha256 = sha256(opts.addr);
   if (opts.username) freshDrip.usernameSha256 = sha256(opts.username);
   await dripRepository.insert(freshDrip);

src/faucet.e2e.ts

@@ -214,7 +214,7 @@ describe("Faucet E2E", () => {
 
     const oldDrip = new Drip();
     oldDrip.addressSha256 = sha256(userAddress);
-    oldDrip.timestamp = new Date(Date.now() - 30 * 60 * 60 * 1000).toISOString();
+    oldDrip.timestamp = BigInt(Date.now() - 30 * 60 * 60 * 1000);
     dripRepository.insert(oldDrip);
 
     const result = await drip(webEndpoint, userAddress);
@@ -227,7 +227,7 @@ describe("Faucet E2E", () => {
 
     const oldDrip = new Drip();
     oldDrip.addressSha256 = sha256(userAddress);
-    oldDrip.timestamp = new Date(Date.now() - 5 * 60 * 60 * 1000).toISOString();
+    oldDrip.timestamp = BigInt(Date.now() - 5 * 60 * 60 * 1000);
     await dripRepository.insert(oldDrip);
 
     await expect(drip(webEndpoint, userAddress)).rejects.toThrow(