merged with main: update date field, modified max length of strings

constants.py

@@ -2,9 +2,9 @@
 constants = {
 
     # ---- INT values
-    'SHORT_LENGTH'              : 10,
-    'MEDIUM_LENGTH'             : 30,
-    'LONG__LENGTH'              : 50,
+    'SHORT_LENGTH'              : 20,
+    'MEDIUM_LENGTH'             : 50,
+    'LONG_LENGTH'               : 100,
     'LONG_TEXT_DESCRIPTION'     : 140,
     'UNIT_LENGTH'               : 2,
     'PRICE_PRECISION'           : 2,

models/raw_material.py

@@ -1,6 +1,7 @@
 
 from db import db #, materials_by_recipe  # import SQLAlchemy object
 from constants import constants         # constants dictionary
+from datetime import datetime
 
 materials_by_recipe = db.Table('materials_by_recipe',
     db.Column('recipe_id', db.Integer, db.ForeignKey('recipes.id'), primary_key=True),
@@ -15,12 +16,14 @@ class RawMaterialModel(db.Model):
 
     # define columns in table
     id = db.Column(db.Integer, primary_key=True)
-    description = db.Column(db.String(constants['MEDIUM_LENGTH']))
+    description = db.Column(db.String(constants['LONG_LENGTH']))
     package_price = db.Column(db.Float(constants['PRICE_PRECISION']))
     package_amt = db.Column(db.Integer)
     unit_material = db.Column(db.String(constants['UNIT_LENGTH']))     # m, ml, L, g (unidades de medicao)
     stock_amt = db.Column(db.Integer)
     sell_by_date = db.Column(db.String(constants['SHORT_LENGTH']))
+    creation_date = db.Column(db.String(constants['MEDIUM_LENGTH']))
+    last_update = db.Column(db.String(constants['MEDIUM_LENGTH']))
 
     # define relationships with other tables
     recipes = db.relationship('RecipeModel',
@@ -36,10 +39,14 @@ def __init__(self, description, package_price, package_amt,
         self.unit_material = unit_material
         self.stock_amt = stock_amt
         self.sell_by_date = sell_by_date
+        self.creation_date = datetime.now().strftime("%d/%m/%Y %H:%M")
+        self.last_update = self.creation_date
 
     def json(self):
         return  {'id'           : self.id,
                  'description'  : self.description,
+                 'creation_date': self.creation_date,
+                 'last_update'  : self.last_update,
                  'package_price': self.package_price,
                  'package_amt'  : self.package_amt,
                  'unit_material': self.unit_material,

models/recipe.py

@@ -11,7 +11,7 @@ class RecipeModel(db.Model):
 
     # define columns in table
     id = db.Column(db.Integer, primary_key=True)
-    description = db.Column(db.String(constants['MEDIUM_LENGTH']))
+    description = db.Column(db.String(constants['LONG_LENGTH']))
     labor_cost = db.Column(db.Float(constants['PRICE_PRECISION']))
     supply_cost = db.Column(db.Float(constants['PRICE_PRECISION']))
     creation_date = db.Column(db.String(constants['MEDIUM_LENGTH']))

resources/orders.py

@@ -12,7 +12,7 @@ class Order(Resource):
     # adds a parser to handle PUT an POST HTTP requests
     parser = reqparse.RequestParser()
     parser.add_argument('status_fabrication',type=str,required=False)
-    parser.add_argument('status_payment',type=float,required=False)
+    parser.add_argument('status_payment',type=str,required=False)
 
     # to handle HTTP GET /orders/<int:id>
     def get(self, id):

resources/raw_material.py

@@ -1,6 +1,7 @@
 # import flask libs
 from flask_restful import Resource, reqparse
 from constants import constants
+from datetime import datetime
 #from flask_jwt import jwt_required
 
 # import model
@@ -59,6 +60,8 @@ def put(self, id):
                 if key=='sell_by_date':
                         raw_material.sell_by_date = data['sell_by_date']
 
+            raw_material.last_update = datetime.now().strftime("%d/%m/%Y %H:%M")
+
         # in case it does not exist, creates a new material using data passed
         # along with the HTTP request
         else:
@@ -100,7 +103,7 @@ def post(self):
 
         # in case it exists, returns a message and HTTP 400 code (BAD REQUEST)
         if raw_material:
-            return {'message': "A raw material with descripton '{}' already exists.".format(description)}, 400
+            return {'message': "A raw material with descripton '{}' already exists.".format(data['description'])}, 400
 
         # in case it does not exist, creates a new material using data passed
         # along with the HTTP request