fix calendar

app/api/services/account.py

@@ -294,9 +294,19 @@ class AccountService(BaseService):
                 user_token = validated_data.get('token')
                 uid = str(validated_data.get('uid'))
 
+                member = Members.get_member_by_uid(uid)
+                if not member:
+                    return {
+                        "error": 'Invalid Request',
+                        "uid": uid,
+                    }, 400
+
+
+                member_id = member.id
+
                 dList = []
                 #LET get the ptovison actions
-                prov_actions = ProvisionActions.get_provision_action_calendar_member_id(member_id=1, limit=100)
+                prov_actions = ProvisionActions.get_provision_action_calendar_member_id(member_id=member_id, limit=100)
 
                 for prov_action in prov_actions:
                     new_l = {"uid": prov_action.uid,
@@ -304,7 +314,7 @@ class AccountService(BaseService):
                              "category": 3}
                     dList.append(new_l)
 
-                member_actions = MembersActions.get_recent_member_calendar_actions_member_id(member_id=1, limit=100)
+                member_actions = MembersActions.get_recent_member_calendar_actions_member_id(member_id=member_id, limit=100)
                 for member_action in member_actions:
                     new_l = {"uid": member_action.uid,
                              "title": member_action.action_label, "start": member_action.added,

app/models/provision_actions.py

@@ -50,7 +50,7 @@ class ProvisionActions(db.Model):
     @classmethod
     def get_provision_action_calendar_member_id(cls, member_id, limit):
         provision_action = cls.query.all()
-        provision_action = cls.query.filter_by(member_id=member_id).limit(limit).all()
+        provision_action = cls.query.filter_by(member_id=member_id).order_by(cls.id.desc()).limit(limit).all()
         if not provision_action:
             return None
         return provision_action