Adds Item Rarity and Update Changes to Postgres DB

Ensures the inspect link is newer if overwriting, fixes up unique item index

Author: Step7750

lib/postgres.js

@@ -46,14 +46,15 @@ class Postgres {
             props       integer NOT NULL,
             stickers    jsonb,
             updated     timestamp NOT NULL,
-            PRIMARY KEY (a, ms, d)
+            rarity      smallint NOT NULL,
+            PRIMARY KEY (a)
         )`);
 
         await this.pool.query(`CREATE INDEX IF NOT EXISTS i_stickers ON items USING gin (stickers jsonb_path_ops) 
                                 WHERE stickers IS NOT NULL`);
         await this.pool.query(`CREATE INDEX IF NOT EXISTS i_paintwear ON items (paintwear)`);
         await this.pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS i_unique_item ON 
-                                items (defindex, paintindex, paintseed, paintwear)`);
+                                items (defindex, paintindex, paintwear, paintseed)`);
     }
 
     async insertItemData(item) {
@@ -104,12 +105,12 @@ class Postgres {
 
             // We define unique items as those that have the same skin, wear, and paint seed
             // Duped items will be represented as one item in this case
-            // If the item already exists, update it's link properties and stickers, these are the only attributes
-            // that can change
-            await this.pool.query(`INSERT INTO items VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11::jsonb, now())
-             ON CONFLICT (paintwear, defindex, paintindex, paintseed) DO UPDATE SET ms=$12, a=$13, d=$14, stickers=$15`,
+            // If the item already exists, update it's link properties and stickers only if it is more recent
+            // (higher item id)
+            await this.pool.query(`INSERT INTO items VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11::jsonb, now(), $12)
+             ON CONFLICT (defindex, paintindex, paintwear, paintseed) DO UPDATE SET ms=$13, a=$14, d=$15, stickers=$16, updated=now() WHERE items.a < excluded.a`,
                 [sm, item.a, item.d, item.paintseed, item.paintwear, item.defindex, item.paintindex, isStattrak,
-                    isSouvenir, props, JSON.stringify(stickers), sm, item.a, item.d, JSON.stringify(stickers)]);
+                    isSouvenir, props, JSON.stringify(stickers), item.rarity, sm, item.a, item.d, JSON.stringify(stickers)]);
         } catch (e) {
             winston.warn(e);
         }