From 58cb925e7faa98ff51eb63d2e6ade74bb5318ee5 Mon Sep 17 00:00:00 2001
From: Vivek Teega <vivek.teega@gmail.com>
Date: Tue, 11 Jun 2019 21:56:59 +0530
Subject: [PATCH] Changes to the API

---
 ranchimallflo_api.py | 67 ++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/ranchimallflo_api.py b/ranchimallflo_api.py
index 8bcc859..30bb592 100644
--- a/ranchimallflo_api.py
+++ b/ranchimallflo_api.py
@@ -341,42 +341,49 @@ async def getParticipantDetails():
 
         if floaddress in list(activeContracts[0]):
             c.execute("select contractName from activecontracts where contractAddress=='"+floaddress+"'")
-            name = c.fetchall()
+            contract_names = c.fetchall()
 
-            if len(name) != 0:
-                contractName = '{}-{}.db'.format(name[0][0].strip(),floaddress.strip())
-                filelocation = os.path.join(dbfolder,'smartContracts', contractName)
+            if len(contract_names) != 0:
 
-                if os.path.isfile(filelocation):
-                    #Make db connection and fetch data
-                    conn = sqlite3.connect(filelocation)
-                    c = conn.cursor()
-                    c.execute(
-                        'SELECT attribute,value FROM contractstructure')
-                    result = c.fetchall()
+                contractlist = []
 
-                    returnval = {'exitconditions': []}
-                    temp = 0
-                    for row in result:
-                        if row[0] == 'exitconditions':
-                            if temp == 0:
-                                returnval["exitconditions"] = [row[1]]
-                                temp = temp + 1
-                            else:
-                                returnval['exitconditions'].append(row[1])
-                            continue
-                        returnval[row[0]] = row[1]
+                for contract_name in contract_names:
+                    contractName = '{}-{}.db'.format(contract_name[0].strip(),floaddress.strip())
+                    filelocation = os.path.join(dbfolder,'smartContracts', contractName)
 
-                    c.execute('select count(participantAddress) from contractparticipants')
-                    noOfParticipants = c.fetchall()[0][0]
-                    returnval['numberOfParticipants'] = noOfParticipants
+                    if os.path.isfile(filelocation):
+                        #Make db connection and fetch data
+                        conn = sqlite3.connect(filelocation)
+                        c = conn.cursor()
+                        c.execute(
+                            'SELECT attribute,value FROM contractstructure')
+                        result = c.fetchall()
 
-                    c.execute('select sum(tokenAmount) from contractparticipants')
-                    totalAmount = c.fetchall()[0][0]
-                    returnval['tokenAmountDeposited'] = totalAmount
+                        returnval = {'exitconditions': []}
+                        temp = 0
+                        for row in result:
+                            if row[0] == 'exitconditions':
+                                if temp == 0:
+                                    returnval["exitconditions"] = [row[1]]
+                                    temp = temp + 1
+                                else:
+                                    returnval['exitconditions'].append(row[1])
+                                continue
+                            returnval[row[0]] = row[1]
 
-                    conn.close()
-                    return jsonify(result='ok', address=floaddress, type='contract', contractInfo=returnval)
+
+                        c.execute('select count(participantAddress) from contractparticipants')
+                        noOfParticipants = c.fetchall()[0][0]
+                        returnval['numberOfParticipants'] = noOfParticipants
+
+                        c.execute('select sum(tokenAmount) from contractparticipants')
+                        totalAmount = c.fetchall()[0][0]
+                        returnval['tokenAmountDeposited'] = totalAmount
+                        conn.close()
+
+                        contractlist.append(returnval)
+
+                return jsonify(result='ok', address=floaddress, type='contract', contractList=contractlist)
 
         # Check if its a participant address
         queryString = "SELECT id, participantAddress,contractName, contractAddress, tokenAmount, transactionHash FROM contractParticipantMapping where participantAddress=='"+floaddress+"'"