diff --git a/access_node/__main__.py b/access_node/__main__.py index ce24a4747ad646eeb9ca766f6b0c81b57e35f692..77bab50047b6a1d01600aecbb90b9b56c0d5e486 100644 --- a/access_node/__main__.py +++ b/access_node/__main__.py @@ -31,7 +31,7 @@ def SetupNestTables(postgres_username, postgres_password, port): cur.execute('''CREATE TABLE MULTIMETERS ( MULTIMETER_ID INT PRIMARY KEY NOT NULL UNIQUE, - ATTRIBUTE CHAR(50) );''') + ATTRIBUTE VARCHAR(50) );''') cur.execute('''CREATE TABLE GIDS ( GID INT PRIMARY KEY NOT NULL UNIQUE, diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py index 517284330826983094231a3a29d0cc9607e4c98a..6b8f1b86214cfad2729719414b6268c0c4a64c15 100644 --- a/access_node/controllers/nest_controller.py +++ b/access_node/controllers/nest_controller.py @@ -48,8 +48,8 @@ def nest_get_gids_in_population(population_id): # noqa: E501 :rtype: List[int] """ con = connect_to_database() - cur = con.cursor() + cur.execute("SELECT GID FROM GIDS WHERE GIDS.POPULATION_ID ="+str(population_id)) gids = [i[0] for i in cur.fetchall()] @@ -68,21 +68,19 @@ def nest_get_multimeter_info(): # noqa: E501 con = connect_to_database() cur = con.cursor() - cur.execute("SELECT MULTIMETER_ID FROM MULTIMETERS") - mult_ids = cur.fetchall() + ur.execute("SELECT * FROM MULTIMETERS;") + attributes = np.array(cur.fetchall()) + - cur.execute("SELECT regexp_replace(ATTRIBUTE, '\s+$', '') FROM (SELECT * FROM MULTIMETERS) AS MULT_INFO;") - attributes = cur.fetchall() - gids = [] - for id in mult_ids: + for id in attributes[:,0]: cur.execute("SELECT GID FROM MULT_PER_GID WHERE MULTIMETER_ID = %s", (id,)) gids.append([i[0] for i in cur.fetchall()]) mult_info = [] - for i in range(len(mult_ids)): - mult_info.append({"id": mult_ids[i][0], - "attributes": attributes[i][0], + for i in range(len(attributes)): + mult_info.append({"id": attributes[i][0], + "attributes": attributes[i][1], "gids": gids[i]})