Merge pull request #7 from MattHalloran/dev

Let's just say I'm practicing dealing with merge conflicts :)

Author: MattHalloran

backend/docs/DatabaseSetup.txt

@@ -11,3 +11,11 @@ To populate database:
 1) Open a terminal in the backend directory
 2) cd tools
 2) python3 createDatabase.py
+
+To perform a databse migration:
+**Note: If you are adding a new Column to an existing table, and it has a default value, note that the "default"
+argument is only interpreted by the python class instance. Please also add a "server_default" argument with a SQL expression
+1) Open a terminal in the backend directory
+1.5) If migrations folder doesn't exist (i.e. first migration), run 'flask db init'
+2) flask db migrate
+3) flask db upgrade

backend/migrations/versions/9e3322745499_.py renamed to backend/migrations/versions/5af486fb9543_.py

@@ -1,30 +1,28 @@
 """empty message
 
-Revision ID: 9e3322745499
+Revision ID: 5af486fb9543
 Revises: 
-Create Date: 2021-02-03 17:36:52.168725
+Create Date: 2021-02-19 18:42:26.954992
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '9e3322745499'
+revision = '5af486fb9543'
 down_revision = None
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('sku', sa.Column('date_added', sa.Float(), nullable=False))
-    op.add_column('sku', sa.Column('price', sa.Integer(), nullable=True))
+    op.add_column('order', sa.Column('is_delivery', sa.Boolean(), server_default='true', nullable=False))
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('sku', 'price')
-    op.drop_column('sku', 'date_added')
+    op.drop_column('order', 'is_delivery')
     # ### end Alembic commands ###

backend/src/handlers.py

@@ -489,7 +489,7 @@ def array_to_dict(model_dict: dict, to_dict, field: str, key=None):
         [array_to_dict(as_dict, PlantTraitHandler.to_dict, field) for field in trait_fields]
 
         return as_dict
-    
+
     @staticmethod
     def from_latin(latin: str):
         return db.session.query(Plant).filter_by(latin_name=latin).one_or_none()
@@ -736,7 +736,7 @@ def is_valid_session(email, token, app):
                 'valid': False,
                 'error': 'Invalid token'
             }
-        # Check if the user 
+        # Check if the user
         return {
             'valid': True,
             'user': user
@@ -788,6 +788,17 @@ def get_cart(user: User):
             cart = user.orders[-1]
         return cart
 
+    @staticmethod
+    def update_order(user: User, is_delivery: bool, requested_date: float, notes: str):
+        cart = UserHandler.get_cart(user)
+        if cart:
+            cart.is_delivery = True
+            cart.desired_delivery_date = requested_date
+            cart.special_instructions = notes
+            db.session.commit()
+            return True
+        return False
+
     @staticmethod
     def submit_order(user: User):
         '''Submits the user's cart. Returns true if successful'''

backend/src/models.py

@@ -632,7 +632,8 @@ def __repr__(self):
 
 class Order(db.Model):
     defaults = {
-        'status': OrderStatus.DRAFT.value
+        'status': OrderStatus.DRAFT.value,
+        'is_delivery': True,
     }
 
     __tablename__ = Tables.ORDER.value
@@ -641,6 +642,7 @@ class Order(db.Model):
     status = Column(Integer, nullable=False, default=defaults['status'])
     special_instructions = Column(String)
     desired_delivery_date = Column(Float)
+    is_delivery = Column(Boolean, nullable=False, default=defaults['is_delivery'])
     delivery_address_id = db.Column(Integer, ForeignKey(f'{Tables.ADDRESS.value}.id'))
     user_id = db.Column(Integer, ForeignKey(f'{Tables.USER.value}.id'))
     address_id = db.Column(Integer, ForeignKey(f'{Tables.ADDRESS.value}.id'))

backend/src/routes.py

@@ -640,11 +640,12 @@ def modify_user():
 @app.route(f'{PREFIX}/submit_order', methods=["POST"])
 @handle_exception
 def submit_order():
-    (session) = getData('session')
+    (session, is_delivery, requested_date, notes) = getData('session', 'is_delivery', 'requested_date', 'notes')
     user = verify_customer(session)
     if not user:
         return {"status": StatusCodes['ERROR_NOT_AUTHORIZED']}
-    if UserHandler.submit_order(user):
+    update_success = UserHandler.update_order(user, is_delivery, requested_date, notes)
+    if update_success and UserHandler.submit_order(user):
         return {"status": StatusCodes['SUCCESS']}
     return {"status": StatusCodes['ERROR_UNKNOWN']}
 

backend/src/uploadAvailability.py

@@ -56,7 +56,7 @@ def upload_availability(app, data):
             if not is_cell_blank(sizes[i]):
                 sku_dict['size'] = str(sizes[i]).replace('#', '')
             if not is_cell_blank(prices[i]):
-                sku_dict['price'] = str(prices[i]).replace('.', '')
+                sku_dict['price'] = str(prices[i]).replace('.', '0')  # Add 0 because price only has one decimal place
             if not is_cell_blank(codes[i]):
                 sku_dict['sku'] = codes[i]
             if not is_cell_blank(quantities[i]):