feat: add history

Author: gjj

digibank/routes/integrations/tbank.py

@@ -227,9 +227,23 @@ def tbank_recipe_salary_transfer():
     expirationTime = int(expirationTime.timestamp()) # convert to epoch, see https://stackoverflow.com/a/23004143/950462
 
     # Let's continue...
+        # Finally, re-queue with the new expiration time (TTL) e.g. current time + 1 month
+    response1 = requests.post("https://api.ourfin.tech/recipes/create/lambda", json={
+        "email": email,
+        "taskName": taskName,
+        "accountFrom": accountFrom,
+        "accountTo": accountTo,
+        "amount": amount,
+        "creationTime": creationTime,
+        "expirationTime": expirationTime,
+        "taskSchedule": taskSchedule,
+        "eventId": eventId,
+        # to add in schedule
+    })
+    logger.info("{} requeued recurring DynamoDB TTL task through Lambda for {} {}".format(email, taskName, response1))
 
     # First, find out transaction history
-    response1 = requests.post("https://api.ourfin.tech/integrations/tbank/transaction_history")
+    # response2 = requests.post("https://api.ourfin.tech/integrations/tbank/transaction_history")
 
     # Look for keyword in transaction history's narrative
 
@@ -241,18 +255,8 @@ def tbank_recipe_salary_transfer():
         "accountTo": accountTo,
         "amount": amount
     })
+    logger.info("{} successfully completed {} {}".format(email, taskName, response2))
 
-    # Finally, re-queue with the new expiration time (TTL) e.g. current time + 1 month
-    response3 = requests.post("https://api.ourfin.tech/recipes/create/lambda", json={
-        "email": email,
-        "taskName": taskName,
-        "accountFrom": accountFrom,
-        "accountTo": accountTo,
-        "amount": amount,
-        "creationTime": creationTime,
-        "expirationTime": expirationTime
-        # to add in schedule
-    })
 
     return jsonify({"status": 200, "message": "OK"}), 200
 

digibank/routes/recipes.py

@@ -54,6 +54,7 @@ def recipes_create_lambda():
 
     email = data['email']
     taskName = data['taskName']
+    eventId = data['eventId']
 
     if taskName == "tbank.salary.transfer":
         accountFrom = data['accountFrom']
@@ -131,7 +132,8 @@ def recipes_create_lambda():
             },
             ExpressionAttributeValues={
                 ':data': {
-                    'task_name': taskName
+                    'task_name': taskName,
+                    'correlation_id': eventId,
                 },
                 ':runTime': int(creationTime),
             },
@@ -230,3 +232,30 @@ def recipes_list():
         data.append(tmp)
 
     return jsonify({"status": 200, "data": data}), 200
+
+@app.route("/recipes/run_history", methods=['POST'])
+@requires_auth
+def recipes_run_history():
+    # find out who's calling this endpoint
+    token = get_token_auth_header()
+    user_info = get_user_info(token)
+    email = user_info['email']
+
+    # then get POSTed form data
+    table = dynamodb.Table("scheduled_tasks_history")
+    response = table.query(
+        KeyConditionExpression=Key("email").eq(email)
+    )
+    data = []
+    tz = pytz.timezone("Asia/Singapore")
+
+    for i in response['Items']:
+        tmp = ast.literal_eval((json.dumps(i, cls=DecimalEncoder)))
+        tmp['run_time'] = datetime.fromtimestamp(
+            tmp['run_time'], tz).isoformat()
+
+        data.append(tmp)
+
+    data = sorted(data, key=lambda k: k['run_time'], reverse=True)
+
+    return jsonify({"status": 200, "data": data}), 200

requirements.txt

@@ -1,3 +1,4 @@
+aniso8601==7.0.0
 astroid==2.4.2
 atomicwrites==1.4.0
 attrs==20.2.0
@@ -23,6 +24,7 @@ MarkupSafe==1.1.1
 mccabe==0.6.1
 packaging==20.4
 pluggy==0.13.1
+promise==2.3
 py==1.9.0
 pyasn1==0.4.8
 pycodestyle==2.6.0
@@ -36,6 +38,7 @@ python-jose==3.2.0
 pytz==2020.1
 requests==2.24.0
 rsa==4.6
+Rx==1.6.1
 s3transfer==0.3.3
 six==1.15.0
 toml==0.10.1