diff --git a/SQL/site_data.sql b/SQL/site_data.sql index 81e3b49..dde6ea5 100644 --- a/SQL/site_data.sql +++ b/SQL/site_data.sql @@ -618,6 +618,9 @@ CREATE TABLE provision_actions ( ALTER TABLE ONLY provision_actions ADD CONSTRAINT provision_actions_id_key UNIQUE (id); +ALTER TABLE provision_actions ADD percent_completed INT DEFAULT 5; + + {"id": "3", "action": "Verifying your product..." , "date": "10-10-2010 11:00 AM"}, {"id": "2", "action": "URL assigned - Progress on the URL " , "date": "10-10-2010 11:30 AM"}, {"id": "1", "action": "Initiating product creation" , "date": "10-12-2010 11:30 AM"}, diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 9c0b016..8727f57 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -260,8 +260,12 @@ class MyProductsService(BaseService): provision_activities = ProvisionActions.get_provision_action_by_product_uid(subscription.uid, 4) provision_activities_data = [] + activity_counter = 0 if provision_activities: for t in provision_activities: + if activity_counter == 0: + percent_completed = t.percent_completed + activity_counter += 1 provision_activities_data.append({ 'id': t.id, 'uid': t.uid, @@ -273,7 +277,7 @@ class MyProductsService(BaseService): "subscription_uid": subscription.uid, "subscription_id": subscription.id, "last_update": datetime.datetime.utcnow(), - "percent_completed": random.randint(10, 99), + "percent_completed": percent_completed, "activities": provision_activities_data } return ResponseHelper.success(data=response_data) diff --git a/app/models/provision_actions.py b/app/models/provision_actions.py index 5b64dd4..d428fb4 100644 --- a/app/models/provision_actions.py +++ b/app/models/provision_actions.py @@ -26,7 +26,7 @@ class ProvisionActions(db.Model): product_uid = db.Column(db.String(100), nullable=False) action = db.Column(db.String(100), nullable=False) added = db.Column(db.DateTime(timezone=True), server_default=func.now()) - + percent_completed = db.Column(db.Integer, nullable=False) @classmethod @@ -74,6 +74,7 @@ class ProvisionActions(db.Model): 'uid': self.uid, 'product_uid': self.product_uid, 'action': self.action, + 'percent_completed': self.percent_completed, 'added': self.added, }