🐛 Fix bug where quantity does not include chest items

backend/services/core/graphql.schema.json

@@ -13670,6 +13670,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "productId",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "variant",
             "description": null,

backend/services/core/migrations/20230822152655_product_id_from_user_inventory_item.ts

@@ -0,0 +1,13 @@
+import { Knex } from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+  await knex.schema.alterTable('user_inventory_item', (table) => {
+    table.uuid('product_id').nullable().references('product.id').onDelete('CASCADE');
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.schema.alterTable('user_inventory_item', (table) => {
+    table.dropColumn('product_id');
+  });
+}

backend/services/core/src/datasources/WebshopAPI.ts

@@ -105,7 +105,7 @@ export default class WebshopAPI extends dbUtils.KnexDataSource {
 
   getProducts(ctx: context.UserContext, categoryId?: string): Promise<gql.Product[]> {
     return this.withAccess('webshop:read', ctx, async () => {
-      let query = this.knex<sql.Product>(TABLE.PRODUCT);
+      let query = this.knex<sql.Product>(TABLE.PRODUCT).whereNull('deleted_at');
       if (categoryId) {
         query = query.where({ category_id: categoryId }); // not tested
       }
@@ -665,6 +665,7 @@ export default class WebshopAPI extends dbUtils.KnexDataSource {
             variant: productInventory.variant,
             user_inventory_id: userInventory.id,
             product_inventory_id: orderItem.product_inventory_id,
+            product_id: product.id,
             category_id: product.category_id,
           }));
         }

backend/services/core/src/schemas/webshop.graphql

@@ -48,6 +48,7 @@ type UserInventory {
 
 type UserInventoryItem {
   id: UUID!
+  productId: UUID
   name: String!
   description: String!
   paidPrice: Float!

backend/services/core/src/shared/converters/webshopConverters.ts

@@ -96,4 +96,5 @@ export const convertUserInventoryItem = (
   paidAt: item.paid_at,
   paidPrice: item.paid_price,
   consumedAt: item.consumed_at,
+  productId: item.product_id,
 });

backend/services/core/src/types/graphql.ts

@@ -1770,6 +1770,7 @@ export type UserInventoryItem = {
   name: Scalars['String']['output'];
   paidAt: Scalars['Date']['output'];
   paidPrice: Scalars['Float']['output'];
+  productId?: Maybe<Scalars['UUID']['output']>;
   variant?: Maybe<Scalars['String']['output']>;
 };
 
@@ -3057,6 +3058,7 @@ export type UserInventoryItemResolvers<ContextType = any, ParentType extends Res
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   paidAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
   paidPrice?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  productId?: Resolver<Maybe<ResolversTypes['UUID']>, ParentType, ContextType>;
   variant?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;

backend/services/core/src/types/webshop.ts

@@ -108,6 +108,7 @@ export interface UserInventoryItem {
   id: UUID,
   user_inventory_id: UUID,
   product_inventory_id: UUID,
+  product_id: UUID,
   category_id: UUID,
   student_id: UUID,
   name: string,

frontend/api/chest.graphql

@@ -15,6 +15,7 @@ query MyChest($studentId: String!) {
       }
       paidAt
       consumedAt
+      productId
     }
   }
 }

frontend/components/Nolla/locales/en.tsx

@@ -31,6 +31,9 @@ export default {
     map: 'Map',
   },
   index: {
+    bite: {
+      copy: 'Beställ mat med gratis leverans i en månad med koden',
+    },
     hero: {
       title: (
         <>

frontend/components/Nolla/locales/sv.tsx

@@ -31,6 +31,9 @@ export default {
     map: 'Karta',
   },
   index: {
+    bite: {
+      copy: 'Beställ mat med gratis leverans i en månad med koden',
+    },
     hero: {
       title: (
         <>

frontend/components/Webshop/Product.tsx

@@ -18,18 +18,24 @@
 import Link from 'next/link';
 import {
   MyCartQuery,
-  ProductsQuery, useAddToMyCartMutation, useMyCartQuery, useProductsQuery,
+  MyChestQuery,
+  ProductsQuery, useAddToMyCartMutation, useMyCartQuery, useMyChestQuery, useProductsQuery,
 } from '~/generated/graphql';
 import handleApolloError from '~/functions/handleApolloError';
 import { useSnackbar } from '~/providers/SnackbarProvider';
 import { useApiAccess } from '~/providers/ApiAccessProvider';
+import { useUser } from '~/providers/UserProvider';
 
-function getQuantityInMyCart(productId: string, myCart?: MyCartQuery['myCart']) {
-  if (!myCart) return 0;
+function getQuantityInMyCart(productId: string, myCart?: MyCartQuery['myCart'], myChest?: MyChestQuery['chest']) {
   const cartItem = myCart?.cartItems.find((p) => p.id === productId);
-  if (!cartItem) return 0;
-  const quantities = cartItem.inventory.map((i) => i.quantity);
-  return quantities.reduce((a, b) => a + b, 0);
+  const chestItems = myChest?.items.filter((p) => p.productId === productId);
+  let quantity = 0;
+  if (cartItem) {
+    const quantities = cartItem.inventory.map((i) => i.quantity);
+    quantity += quantities.reduce((a, b) => a + b, 0);
+  }
+  quantity += chestItems.length;
+  return quantity;
 }
 
 // time diff in milliseconds
@@ -54,11 +60,15 @@
 
 export default function Product({ product }: { product: ProductsQuery['products'][number] }) {
   const { t } = useTranslation();
+  const { user } = useUser();
   const { showMessage } = useSnackbar();
   const [selectedVariant, setSelectedVariant] = useState(product.inventory[0]);
   const [timeLeft, setTimeLeft] = useState(Number.MAX_VALUE);
   const { refetch: refetchMyCart, data } = useMyCartQuery();
-  const quantityInMyCart = getQuantityInMyCart(product.id, data?.myCart);
+  const { data: chestData } = useMyChestQuery({
+    variables: { studentId: user?.student_id },
+  });
+  const quantityInMyCart = getQuantityInMyCart(product.id, data?.myCart, chestData?.chest);
   const { refetch: refetchProducts } = useProductsQuery(
     { variables: { categoryId: product.category.id } },
   );
@@ -88,7 +98,7 @@
       setTimeLeft(0);
     }
     return () => clearInterval(interval);
   }, [product]);
 
   const { hasAccess } = useApiAccess();
 

frontend/generated/graphql.tsx

@@ -1775,6 +1775,7 @@ export type UserInventoryItem = {
   name: Scalars['String'];
   paidAt: Scalars['Date'];
   paidPrice: Scalars['Float'];
+  productId?: Maybe<Scalars['UUID']>;
   variant?: Maybe<Scalars['String']>;
 };
 
@@ -2068,7 +2069,7 @@ export type MyChestQueryVariables = Exact<{
 }>;
 
 
-export type MyChestQuery = { __typename?: 'Query', chest?: { __typename?: 'UserInventory', id: any, items: Array<{ __typename?: 'UserInventoryItem', id: any, name: string, description: string, paidPrice: number, imageUrl: string, variant?: string | null, paidAt: any, consumedAt?: any | null, category?: { __typename?: 'ProductCategory', id: any, name: string, description: string } | null } | null> } | null };
+export type MyChestQuery = { __typename?: 'Query', chest?: { __typename?: 'UserInventory', id: any, items: Array<{ __typename?: 'UserInventoryItem', id: any, name: string, description: string, paidPrice: number, imageUrl: string, variant?: string | null, paidAt: any, consumedAt?: any | null, productId?: any | null, category?: { __typename?: 'ProductCategory', id: any, name: string, description: string } | null } | null> } | null };
 
 export type ConsumeItemMutationVariables = Exact<{
   itemId: Scalars['UUID'];
@@ -4095,6 +4096,7 @@ export const MyChestDocument = gql`
       }
       paidAt
       consumedAt
+      productId
     }
   }
 }