offers changes and select status

api/prisma/schema.prisma

@@ -67,12 +67,13 @@ model Offer {
     status          String
 
     item            Decimal    @db.Money
+    // markup          Decimal    @db.Money
     shipping        Decimal    @db.Money
     total           Decimal    @db.Money
     comparison      Decimal    @db.Money
 
     listingId       Int
-    listing         Listing    @relation(fields: [listingId], references: [id], onDelete: Restrict)
+    listing         Listing    @relation(fields: [listingId], references: [id])
 
     userId          String     @db.Uuid
     user            User       @relation(fields: [userId], references: [id], onDelete: Cascade)

api/src/events.ts

@@ -27,6 +27,7 @@ export default function createEvents(log: Log, pg: Pg, discogs, offers) {
                 await setTimeout(60 * 1000);
                 return populateListings(want);
             }
+            throw e;
         }
     }
 

api/src/offers.ts

@@ -10,8 +10,9 @@ import { Pg } from './pg';
 export enum Status {
     Pending      = 'pending',
     Accepted     = 'accepted',
+    Declined     = 'declined',
     Ordered      = 'ordered',
-    Delivered    = 'delivered',
+    Complete     = 'complete',
 }
 
 export default function createOffers(log: Log, pg: Pg) {

api/src/pg.ts

@@ -2,7 +2,7 @@ import bcrypt from 'bcrypt';
 import type Log from 'bunyan';
 import type { PrismaClient, Want, User, Listing, Offer, Prisma } from '@prisma/client';
 import * as Bluebird from 'bluebird';
-import omit from 'lodash/omit';
+import _ from 'lodash';
 
 import { Status } from './offers';
 
@@ -123,17 +123,56 @@ export default function createPg(log: Log, prisma: PrismaClient): Pg {
         });
     }
 
-    async function listingRmUnlisted(want: Want, ids: DiscogsListing[]) {
+    async function listingRmUnlisted(want: Want, currentListingIds: DiscogsListing[]) {
+        return prisma.$transaction(async (prisma) => {
+            log.debug({ currentListingIds });
+
+            const openOfferStatuses = [Status.Pending, Status.Accepted];
+
+            // can't delete a listing with an open offer
+            // so delete those offers first
+            const { count: offersRemoved } = await prisma.offer.deleteMany({
+                where: {
+                    wantId: want.id,
+                    listingId: {
+                        notIn: currentListingIds,
+                    },
+                    status: {
+                        in: openOfferStatuses,
+                    },
+                }
+            });
+
+            if (offersRemoved > 0) log.info({ offersRemoved }, 'open offers removed');
+
+            // now we have to filter listingIds with confirmed offers
+            // and get their listingIds to filter out
+            const confirmedListingIds = (await prisma.offer.findMany({
+                where: {
+                    wantId: want.id,
+                    status: {
+                        notIn: openOfferStatuses,
+                    }
+                },
+                select: {
+                    listingId: true,
+                }
+            })).map(r => r.listingId);
+            const removalIds = _.without(currentListingIds, ...confirmedListingIds);
+
+            // finally we delete listings that aren't related
+            // to a historical offer
             const { count } = await prisma.listing.deleteMany({
                 where: {
                     wantId: want.id,
                     id: {
-                    notIn: ids,
+                        notIn: currentListingIds,
                     }
                 }
             });
 
             return count;
+        });
     }
 
     async function listingUpsert(listing, want) {
@@ -214,7 +253,7 @@ export default function createPg(log: Log, prisma: PrismaClient): Pg {
                     listingId: offer.listingId,
                 },
                 create: offer,
-                update: omit(offer, ['status']),
+                update: _.omit(offer, ['status']),
             }))
         );
     }

client/src/actions.ts

@@ -2,6 +2,10 @@ import { route } from 'preact-router';
 import http from './http';
 
 const actions = store => ({
+    setWs: function setWs(state, ws) {
+        return { ws };
+    },
+
     setUser: function setUser(state, user) {
         return { user };
     },

client/src/app.tsx

@@ -26,11 +26,12 @@ async function init() {
     if (error) return route('/login');
     route('/bundles');
     store.setState({ user });
+    store.setState({ ws });
 }
 
 init();
 
-const App = () =>{
+const App = () => {
     return (
         <Provider store={store}>
             <main id="app">

client/src/http.ts

@@ -96,6 +96,13 @@ const actions = {
             id,
         });
     },
+
+    postOfferStatus: async function postOfferStatus(id, status) {
+        return api.post('/acp/offer/status', {
+            id,
+            status,
+        });
+    },
 };
 
 export default actions;

client/src/routes/acp.tsx

@@ -1,12 +1,22 @@
 import { h } from 'preact';
 import { useState, useEffect } from 'preact/hooks';
+import { connect } from 'unistore/preact'
 
 import http from './../http';
 import AcpOffer from './../components/acp.offer';
 
-function Item(item) {
+import { Status } from './../../../api/src/offers';
 
+function ItemEl({ item, ws }) {
     console.log(item);
+    console.log(ws);
+    const statuses = Object.entries(Status).map(([label, value]) => (
+        <option value={value}>{label}</option>
+    ));
+
+    function onChange(e) {
+        console.log(item.id, e.target.value);
+    }
 
     return (
         <div key={item.id}>
@@ -15,10 +25,15 @@ function Item(item) {
             </a>
             <h5 class='alt-text'>{item.total}</h5>
             <h5>{item.status}</h5>
+            <select onChange={onChange}>
+                {statuses}
+            </select>
         </div>
     );
 }
 
+const Item = connect(['ws'], {}, ItemEl);
+
 function SellerGroup(group) {
     return (
         <div class="bundle">
@@ -29,7 +44,7 @@ function SellerGroup(group) {
             </section>
 
             <div class='items'>
-                {group.offers.map(Item)}
+                {group.offers.map(i => <Item item={i} />)}
             </div>
         </div>
     )

client/src/store.tsx

@@ -5,5 +5,6 @@ export default function createStore() {
         bundles: [],
         offers: [],
         user: null,
+        ws: null,
     });
 };

docker-compose.yaml

@@ -31,6 +31,7 @@ services:
       - '8080:8080' # fwd the hmr websocket
     volumes:
       - "./client:/opt/mcrates/client"
+      - "./api:/opt/mcrates/api"
 
   nginx:
     image: nginx:latest