Bug Fixes

-Fixed issue where website would crash after registering for the first time
-Fixed bugs that occur when no plants are available
-Fixed bug with uploadAvailability

Author: MattHalloran

backend/src/handlers.py

@@ -98,13 +98,9 @@ def create(cls, *args):
         '''Create a new model object'''
         # If a dict of values is passed in
         if len(args) == 1 and type(args[0]) is dict:
-            print(f'CREATING OBJECT FROM DICT... {args[0]}')
             return cls.create_from_dict(args[0])
         # If arguments are passed in to match the model's __init___
         else:
-            print('CREATING OBJECT FROM ARGS...')
-            print(type(args[0]))
-            print(args[0])
             return cls.create_from_args(*args)
 
     @classmethod
@@ -460,7 +456,6 @@ def get_b64(cls, model, size: str):
         # Finally, if no image found, return None
         return None
 
-
     @staticmethod
     def from_used_for(used_for: ImageUses):
         return db.session.query(Image).filter_by(used_for=used_for.value).all()
@@ -974,6 +969,16 @@ def all_customers():
     def from_email(email: str):
         return User.query.filter(User.personal_email.any(email_address=email)).first()
 
+    @staticmethod
+    def email_in_use(email: str):
+        '''Returns True if the email is being used by an active account'''
+        users = User.query.filter(User.personal_email.any(email_address=email)).all()
+        print('IN EMAIL IN USE')
+        print(users)
+        if users is None:
+            return True
+        return any(user.account_status != AccountStatus.DELETED.value for user in users)
+
     @staticmethod
     def is_customer(user: User):
         print(RoleHandler.all_dicts(user.roles))

backend/src/routes.py

@@ -3,7 +3,7 @@
 from src.api import create_app, db
 from src.models import AccountStatus, Sku, SkuStatus, ImageUses, PlantTraitOptions, OrderStatus
 from src.handlers import BusinessHandler, UserHandler, SkuHandler, EmailHandler, OrderHandler, OrderItemHandler
-from src.handlers import PhoneHandler, PlantHandler, PlantTraitHandler, ImageHandler, ContactInfoHandler
+from src.handlers import PhoneHandler, PlantHandler, PlantTraitHandler, ImageHandler, ContactInfoHandler, RoleHandler
 from src.messenger import welcome, reset_password
 from src.auth import generate_token, verify_token
 from src.config import Config
@@ -126,14 +126,22 @@ def consts():
 def register():
     (data) = getData('data')
     # If email is already registered
-    if any(UserHandler.from_email(e['email_address']) for e in data['emails']):
+    if any(UserHandler.email_in_use(e['email_address']) for e in data['emails']):
         print('ERROR: Email exists')
         return StatusCodes['FAILURE_EMAIL_EXISTS']
+    # Create user
     user = UserHandler.create(data)
+    # Give the user a customer role
+    user.roles.append(RoleHandler.get_customer_role())
+    # Update the user's profile data
     UserHandler.set_profile_data(user, data)
+    # Create a session token
+    token = generate_token(app, user)
+    UserHandler.set_token(user, token)
+    db.session.commit()
     return {
         **StatusCodes['SUCCESS'],
-        "token": generate_token(app, user),
+        "token": token,
         "user": UserHandler.to_dict(user)
     }
 
@@ -631,8 +639,10 @@ def update_trait(option: PlantTraitOptions, value: str):
             db.session.add(new_trait)
             return new_trait
         print(f"TODOOOOOOOO {plant_data}")
-        plant_obj.latin_name = plant_data['latin_name']
-        plant_obj.common_name = plant_data['common_name']
+        if (latin := plant_data.get('latin_name', None)):
+            plant_obj.latin_name = latin
+        if (common := plant_data.get('common_name', None)):
+            plant_obj.common_name = common
         plant_obj.drought_tolerance = update_trait(PlantTraitOptions.DROUGHT_TOLERANCE, plant_data['drought_tolerance'])
         plant_obj.grown_height = update_trait(PlantTraitOptions.GROWN_HEIGHT, plant_data['grown_height'])
         plant_obj.grown_spread = update_trait(PlantTraitOptions.GROWN_SPREAD, plant_data['grown_spread'])
@@ -684,6 +694,13 @@ def modify_user():
     }
     if operation in operation_to_status:
         user.account_status = operation_to_status[operation]
+        if operation == 'DELETE':
+            for email in user.personal_email:
+                user.personal_email.remove(email)
+                db.session.delete(email)
+            for phone in user.personal_phone:
+                user.personal_phone.remove(phone)
+                db.session.delete(phone)
         db.session.commit()
         return {
             **StatusCodes['SUCCESS'],

backend/src/uploadAvailability.py

@@ -44,7 +44,9 @@ def upload_availability(app, data):
             # If SKU not found by code or plant, create from scratch
             if sku is None:
                 print(f'Could not find SKU associated with {curr_sku}. Attempting to create new one')
-                plant = PlantHandler.create(curr_latin)
+                plant = PlantHandler.from_latin(curr_latin)
+                if not plant:
+                    plant = PlantHandler.create(curr_latin)
                 db.session.add(plant)
                 db.session.commit()
                 sku = SkuHandler.create()

frontend/src/pages/admin/AdminInventoryPage/AdminInventoryPage.js

@@ -51,7 +51,8 @@ function AdminInventoryPage() {
     }, [])
 
     useEffect(() => {
-        let ids = existing.map(p => p.display_id);
+        let ids = existing?.map(p => p.display_id);
+        if (!ids) return;
         getImages(ids, 'm').then(response => {
             setExistingThumbnails(response.images);
         }).catch(err => {
@@ -60,7 +61,8 @@ function AdminInventoryPage() {
     }, [existing])
 
     useEffect(() => {
-        let ids = existing.map(p => p.display_id);
+        let ids = existing?.map(p => p.display_id);
+        if (!ids) return;
         getImages(ids, 'm').then(response => {
             setAllThumbnails(response.images);
         }).catch(err => {
@@ -203,7 +205,7 @@ function AdminInventoryPage() {
                 <h2>Sort</h2>
                 <DropDown options={SORT_OPTIONS} onChange={handleExistingSort} initial_value={SORT_OPTIONS[0]} />
                 <div className="card-flex">
-                    {existing.map((plant, index) => <PlantCard key={index}
+                    {existing?.map((plant, index) => <PlantCard key={index}
                         plant={plant}
                         onEdit={() => setCurrPlant(plant)}
                         thumbnail={existingThumbnails?.length >= index ? existingThumbnails[index] : null} />)}
@@ -213,7 +215,7 @@ function AdminInventoryPage() {
                 <h2>Sort</h2>
                 <DropDown options={PLANT_SORT_OPTIONS} onChange={handleAllSort} initial_value={PLANT_SORT_OPTIONS[0]} />
                 <div className="card-flex">
-                    {all.map((plant, index) => <PlantCard key={index}
+                    {all?.map((plant, index) => <PlantCard key={index}
                         plant={plant}
                         onEdit={() => setCurrPlant(plant)}
                         thumbnail={allThumbnails?.length >= index ? allThumbnails[index] : null} />)}
@@ -336,13 +338,13 @@ function PlantPopup({
         setSize(selectedSku['size']);
         setPrice(displayPrice(selectedSku['price']));
         setQuantity(selectedSku['availability']);
-        setLatinName(selectedSku['latin_name']);
-        setCommonName(selectedSku['common_name']);
-        setDroughtTolerance(selectedSku['drought_tolerance']);
-        setGrownHeight(selectedSku['grown_height']);
-        setGrownSpread(selectedSku['grown_spread'])
-        setOptimalLight(selectedSku['optimal_light']);
-        setSaltTolerance(selectedSku['salt_tolerance']);
+        setLatinName(selectedSku['plant']['latin_name']);
+        setCommonName(selectedSku['plant']['common_name']);
+        setDroughtTolerance(selectedSku['plant']['drought_tolerance']?.value);
+        setGrownHeight(selectedSku['plant']['grown_height']?.value);
+        setGrownSpread(selectedSku['plant']['grown_spread']?.value)
+        setOptimalLight(selectedSku['plant']['optimal_light']?.value);
+        setSaltTolerance(selectedSku['plant']['salt_tolerance']?.value);
     }, [selectedSku])
 
     const savePlant = () => {
@@ -447,7 +449,7 @@ function PlantPopup({
             <div className="sidenav">
                 <h3>SKUs</h3>
                 <div className="sku-list">
-                    {skus.map(s => (
+                    {skus?.map(s => (
                         <div className={`sku-option ${s === selectedSku ? 'selected' : ''}`}
                             onClick={() => setSelectedSku(s)}>{s.sku}</div>
                     ))}

frontend/src/pages/shopping/ShoppingList/ShoppingList.js

@@ -43,8 +43,8 @@ function ShoppingList({
     const loading = useRef(false);
 
     useEffect(() => {
-        let ids = plants.map(p => p.display_id);
-        console.log('IDS ARE', ids, plants);
+        let ids = plants?.map(p => p.display_id);
+        if (!ids) return;
         getImages(ids, 'm').then(response => {
             setThumbnails(response.images);
         }).catch(err => {
@@ -224,7 +224,7 @@ function ShoppingList({
     return (
         <StyledShoppingList id={track_scrolling_id}>
             {popup}
-            {plants.map((item, index) =>
+            {plants?.map((item, index) =>
                 <PlantCard key={index}
                     theme={theme}
                     cart={cart}

frontend/src/query/http_promises.js

@@ -121,7 +121,7 @@ export function registerUser(email, data) {
     return new Promise(function (resolve, reject) {
         http.create_user(data).then(response => {
             if (response.ok) {
-                login({email: email, token: data.token }, data.user);
+                login({email: email, token: response.token }, response.user);
                 resolve(data);
             } else {
                 console.log('REGISTER FAIL LOGGING OUT')