From 44c83d3b33b651bfdd42b863eeafcfd338acb796 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 30 Aug 2022 18:39:22 +1000
Subject: [PATCH] moar logs

---
 api/prisma/schema.prisma         |  2 -
 api/src/discogs.ts               |  5 ++-
 api/src/events.ts                | 26 +++++++------
 api/src/utils.ts                 | 13 +++++++
 client/src/app.tsx               |  3 +-
 client/src/components/header.tsx |  9 ++++-
 client/src/routes/home.tsx       |  2 +
 client/src/routes/login.tsx      | 11 +++---
 client/tsconfig.json             | 64 ++++++++++++++++++++++++++++++++
 9 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 client/tsconfig.json

diff --git a/api/prisma/schema.prisma b/api/prisma/schema.prisma
index 5afbe05..4fe6b0d 100644
--- a/api/prisma/schema.prisma
+++ b/api/prisma/schema.prisma
@@ -69,8 +69,6 @@ model Offer {
     total           Decimal    @db.Money
     comparison      Decimal    @db.Money
 
-    sellerId        Int
-
     listingId       Int
     listing         Listing    @relation(fields: [listingId], references: [id])
 
diff --git a/api/src/discogs.ts b/api/src/discogs.ts
index 0ed41e2..c8a29f9 100644
--- a/api/src/discogs.ts
+++ b/api/src/discogs.ts
@@ -7,7 +7,7 @@ import Bluebird from 'bluebird';
 import type Log from 'bunyan';
 import type { PrismaClient, Want, User, Listing } from '@prisma/client';
 
-import { logAxiosError } from './utils';
+import { logAxiosError, wantDetails } from './utils';
 import { Pg } from './pg';
 
 // margh
@@ -39,6 +39,8 @@ export default function createDiscogs(log: Log, pg: Pg) {
         const { data: { wants, pagination }} = await api.get(`${apiBase}/users/${username}/wants`);
         const releases = await Promise.all(wants.map(want => release(want.id)));
 
+        log.info({ wants: wants.length, user: username, userId: user.id }, 'fetched discogs wantlist');
+
         // TODO filter releases to be vinyl format only
 
         // convert want object to actual release and ignore duplicate errors
@@ -83,6 +85,7 @@ export default function createDiscogs(log: Log, pg: Pg) {
 
         // preferentially take listings from sellers if we hit req limits
 
+        log.info({ listings: ids.length, ...wantDetails(want)}, 'found listings');
         return Bluebird.mapSeries(ids, async id => listing(id, want));
     }
 
diff --git a/api/src/events.ts b/api/src/events.ts
index 5bf2ab8..160c634 100644
--- a/api/src/events.ts
+++ b/api/src/events.ts
@@ -1,9 +1,11 @@
 import { EventEmitter } from 'node:events';
+import { setTimeout } from 'timers/promises';
 
 import type Log from 'bunyan';
 import type { Want } from '@prisma/client';
 
 import { Pg } from './pg';
+import { wantDetails } from './utils';
 import routerAuth from './routers/router.auth';
 
 export enum Events {
@@ -19,9 +21,10 @@ export default function createEvents(log: Log, pg: Pg, discogs) {
     });
 
     events.on(Events.WantsAdded, async function wantsAdded(wants: Want[]) {
+        log.info({ event: Events.WantsAdded, wants: wants.length });
         for (const want of wants) {
             const listings = await discogs.listings(want);
-            log.info({ count: listings.length, title: want.id }, 'listings added')
+            log.info({ count: listings.length, ...wantDetails(want) }, 'listings added')
         }
 
         log.info('finished fetching listings', { wants: wants.length });
@@ -29,20 +32,21 @@ export default function createEvents(log: Log, pg: Pg, discogs) {
 
     events.on(Events.StartupSync, async function wantsAdded() {
         const wants = await pg.wantsToSync();
+        log.info({ event: Events.StartupSync, wants: wants.length });
 
-        try {
-            for (const want of wants) {
+        for (const want of wants) {
+            try {
                 const listings = await discogs.listings(want);
-                log.info({ count: listings.length, title: want.id }, 'listings added')
-            }
-
-            log.info('finished syncing', { wants: wants.length });
-        } catch (e) {
-            if (e.message === 'rate limited') {
-                log.warn('rate limited, trying again in 60s');
-                return setTimeout(() => events.emit(Events.StartupSync), 60 * 1000);
+                log.info({ count: listings.length, ...wantDetails(want) }, 'listings added')
+            } catch (e) {
+                if (e.message === 'rate limited') {
+                    log.warn('rate limited, trying again in 60s');
+                    await setTimeout(60 * 1000);
+                    const listings = await discogs.listings(want);
+                }
             }
         }
+        log.info('finished syncing', { wants: wants.length });
     });
 
 
diff --git a/api/src/utils.ts b/api/src/utils.ts
index 4ef9082..7254e45 100644
--- a/api/src/utils.ts
+++ b/api/src/utils.ts
@@ -1,3 +1,5 @@
+import type { Want } from '@prisma/client';
+
 export function logAxiosError(e) {
     console.warn({
         status: e.response.status,
@@ -11,3 +13,14 @@ export function logAxiosError(e) {
         },
     });
 }
+
+export function wantDetails(want: Want) {
+    const data = want.data as any;
+
+    return {
+        title: data.title,
+        release: data.id,
+        artist: data.artists_sort,
+        id: want.id
+    }
+}
\ No newline at end of file
diff --git a/client/src/app.tsx b/client/src/app.tsx
index 368510d..7843f36 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -37,7 +37,8 @@ function App() {
             <Header user={user} />
             <Router>
                 <Route path="/" component={Home} />
-                <Route path="/login" component={Login} success={loginSuccess} />
+                <Route path="/login" component={Login} success={loginSuccess} mode="login" />
+                <Route path="/register" component={Login} success={loginSuccess} mode="register" />
                 <Route path="/search" component={Search} />
                 <Route path="/list" component={List} user={user} />
 
diff --git a/client/src/components/header.tsx b/client/src/components/header.tsx
index 96955c2..a910463 100644
--- a/client/src/components/header.tsx
+++ b/client/src/components/header.tsx
@@ -10,6 +10,13 @@ const Header = ({ user }) => {
         </nav>
     );
 
+    const anonNav = () => (
+        <nav>
+            <a href="/login">Login</a>
+            <a href="/register">Register</a>
+        </nav>
+    );
+
     const adminNav = () => (
         <nav>
             <a href="/bundles">Bundles</a>
@@ -20,7 +27,7 @@ const Header = ({ user }) => {
 
     return (
         <header>
-            {user ? nav() : null}
+            {user ? nav() : anonNav()}
             <div></div>
             {user ? adminNav() : null}
         </header>
diff --git a/client/src/routes/home.tsx b/client/src/routes/home.tsx
index 9134122..f901d38 100644
--- a/client/src/routes/home.tsx
+++ b/client/src/routes/home.tsx
@@ -1,5 +1,6 @@
 import { h } from 'preact';
 import { useState, useEffect } from 'preact/hooks';
+import {  route } from 'preact-router';
 
 import actions from './../actions';
 import Offer from './../components/offer';
@@ -13,6 +14,7 @@ function Home() {
             if (error) return console.error(error);
             console.log(offers);
             setOffers(offers);
+            if (offers.length === 0) route('/search');
         }
         getOffers();
     }, []);
diff --git a/client/src/routes/login.tsx b/client/src/routes/login.tsx
index f331388..e947488 100644
--- a/client/src/routes/login.tsx
+++ b/client/src/routes/login.tsx
@@ -2,13 +2,14 @@ import { h } from 'preact';
 import { useState } from 'preact/hooks';
 import actions from './../actions';
 
-const Login = ({ success }) => {
-    const [mode, setMode] = useState('login')
+const Login = ({ success, mode }) => {
     const [email, setEmail] = useState('')
     const [password, setPassword] = useState('');
     const [confirmPassword, setConfirmPassword] = useState('');
     const [error, setError] = useState('');
 
+    console.log(confirmPassword);
+
     async function postLogin() {
         const [error, user] = await actions.postLogin(email, password);
         if (error) return setError(error);
@@ -51,7 +52,6 @@ const Login = ({ success }) => {
                     <input type="submit" value="register" onClick={handleSubmit} />
                 </div>
             </form>
-            <button onClick={() => setMode('login')} >Click to login</button>
         </div>
 
     );
@@ -72,15 +72,14 @@ const Login = ({ success }) => {
                     <input type="submit" value="login" onClick={handleSubmit} />
                 </div>
             </form>
-            <button onClick={() => setMode('register')} >Click to register</button>
         </div>
     );
 };
 
-function LoginPage({ success }) {
+function LoginPage({ success, mode }) {
     return (
         <div class="landing">
-            <Login success={success} />
+            <Login success={success} mode={mode} />
             <div></div>
             <div class="info">
                 <p>Mates Crates is a record importing service.</p>
diff --git a/client/tsconfig.json b/client/tsconfig.json
new file mode 100644
index 0000000..f419968
--- /dev/null
+++ b/client/tsconfig.json
@@ -0,0 +1,64 @@
+{
+    "compilerOptions": {
+        /* Basic Options */
+        "target": "ES5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
+        "module": "ESNext",                       /* Specify module code generation: 'none', commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+        // "lib": [],                             /* Specify library files to be included in the compilation:  */
+        "allowJs": true,                          /* Allow javascript files to be compiled. */
+        // "checkJs": true,                       /* Report errors in .js files. */
+        "jsx": "react",                           /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+        "jsxFactory": "h",                        /* Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h. */
+        "jsxFragmentFactory": "Fragment",         /* Specify the JSX fragment factory function to use when targeting react JSX emit with jsxFactory compiler option is specified, e.g. Fragment. */
+        // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+        // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+        // "outFile": "./",                       /* Concatenate and emit output to single file. */
+        // "outDir": "./",                        /* Redirect output structure to the directory. */
+        // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+        // "removeComments": true,                /* Do not emit comments to output. */
+        "noEmit": true,                           /* Do not emit outputs. */
+        // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+        // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+        // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+        /* Strict Type-Checking Options */
+        "strict": false,                           /* Enable all strict type-checking options. */
+        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+        // "strictNullChecks": true,              /* Enable strict null checks. */
+        // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+        // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+        /* Additional Checks */
+        // "noUnusedLocals": true,                /* Report errors on unused locals. */
+        // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+        // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+        // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+        /* Module Resolution Options */
+        "moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+        "esModuleInterop": true,                  /* */
+        "baseUrl": "./",                          /* Base directory to resolve non-absolute module names. */
+        "paths": {                                /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+          "react": ["./node_modules/preact/compat"],
+          "react-dom": ["./node_modules/preact/compat"]
+        },
+        // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+        // "typeRoots": [],                       /* List of folders to include type definitions from. */
+        // "types": [],                           /* Type declaration files to be included in compilation. */
+        // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+        // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+        /* Source Map Options */
+        // "sourceRoot": "./",                    /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+        // "mapRoot": "./",                       /* Specify the location where debugger should locate map files instead of generated locations. */
+        // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+        // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+        /* Experimental Options */
+        // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+        // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+        /* Advanced Options */
+        "skipLibCheck": true                      /* Skip type checking of declaration files. */
+    },
+    "include": ["src/**/*"]
+}