From d81373889e4f38fc11b761a580ef0c8de1dd775f Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 22 Feb 2024 12:33:35 +0100
Subject: [PATCH] fix: sql_query
---
server/main.py | 1 +
.../__pycache__/get_markers.cpython-311.pyc | Bin 3320 -> 3283 bytes
server/map/get_markers.py | 25 +++++++++---------
server/sql_db/icedb | Bin 45056 -> 45056 bytes
server/sql_db/schema.sql | 6 ++++-
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/server/main.py b/server/main.py
index f44d0175..8d2a01ba 100644
--- a/server/main.py
+++ b/server/main.py
@@ -42,6 +42,7 @@ class IceHTTP(BaseHTTPRequestHandler):
elif self.path == '/get_valid_markers': # NB: should be POST?
get_all_markers(self, self.cursor, True, 'Mjosa') # Get only valid markers
# NB: temporary hardcoded waterBodyName
+
def do_POST(self):
if self.path == '/get_weather_data':
get_weather(self)
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index d7a54e2e927f314e198348cc16ce57c24ed6ba17..9022d0973498de25e88a2027322312cc421a0be4 100644
GIT binary patch
delta 424
zcmew%d0CQgIWI340}#A2xSslucOqXj<AaG=#%#+N85mYGPF!xyxMJgDc1A}2$*&nD
z^#vqBO2Gi40LDuZoWoqhna-FZG>4^zt%kz}DABWWvLn-FMuE+u%zliF?weCsteDu<
zeY5h56V)frXLFnUg-w{}CCKuZ+#rHyG7Ebor%!%fdS*#!O6ue^b|p4ukOa%*PIhG`
zO_s@<*|j#mV&`HKvIh#Y0da8@69Yp7!v`j>$!uJjoEJG1uW%?{;82`w%O%Gq&nfhQ
zL4I-~m%d=q67?I(Y72^%nBS0*U%)iSeey!Ce0{?uWeatd=zL&jkr(^G03x^;R1Fu{
zeGud{0cr&j7X%a*$XygLxFBHgRbsOnw+5rVkgF)eQBf{ed*-9^Vy;%qN3B?aY)$4O
z4WN69ltBc@bt@S@14)J=J0S6k!zMRBr8FniuE=TfS{@nwU`9rx6(S!PKs0``$PuU?
E0K!{ru>b%7
delta 477
zcmcaC`9qR#IWI340}vdNx}M6yH<2%z@zcaCW3C$JG{$923=FH8CN8#ST)*)?JEJt0
zBuF6`l(55C3=B2wDg2WenIx43<}lZArZWQhf(Vr<LUUMa*lIXzfEs!>Ox9<*%*eW#
znc0t#(Q$JSixm^2{p87PZt~1P>6a`Zf)zxtfe4TtFF8O2=j0!3k(@dHe(s(jp)RhI
zqu7-gxh6NUE3?1k1IlZ%PF~Kg#e0j}DL<vsKP^15B(-SsMRqPGAqSu=$gJWtpkEpo
zJ}`Mte#@!Jx4`y-lF>yD<0~A-7dVV3%X7)GDR2sXU{ILs%%v}wxJ2!Svf6^eC1y8d
z<QFi`ahu%Cm2YOWq<o?765S8%Eb?L>7(fIUgR0>IJCM?%CFUQ5xlDj20Er6%3Jc^e
z3K(1vF!(C9S&>_V(O%kBj^U^rmm3H3Q4KLSX69qetU$IVbCD*{ZAB^|!U0IEWcUmu
q8H((I#4iq;-29Z%oK(9a=gA#BGWsEmj7BR&J}`i2{A7_6P(J{+V|8!<
diff --git a/server/map/get_markers.py b/server/map/get_markers.py
index 067f0af6..74d2678c 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -16,13 +16,13 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName):
INNER JOIN Sensor s ON m.SensorID = s.SensorID
INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
LEFT JOIN SubDivision d ON m.MeasurementID = d.MeasurementID
- WHERE b.Name = ?
+ WHERE b.Name = 'Mjosa'
'''
- if valid: # Append time restriction, NB temporarily hardcoded to 5 days
+ if valid: # Append time restriction to WHERE statement, NB temporarily hardcoded to 5 days
sql_query += ' AND m.TimeMeasured > DATE_SUB(NOW(), INTERVAL 5 DAY)'
- cursor.execute(sql_query, (waterBodyName,))
+ cursor.execute(sql_query)
rows = cursor.fetchall()
@@ -35,13 +35,13 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName):
# Create subdivision object for current row
sub_division = {
- 'SubDivisionID': row[3],
- 'GroupID': row[4],
- 'MinimumThickness': row[5],
- 'AverageThickness': row[6],
- 'CenterLatitude': row[7],
- 'CenterlONGITUDE': row[8],
- 'Accuracy': row[9]
+ 'SubDivisionID': row[6],
+ 'GroupID': row[7],
+ 'MinimumThickness': row[8],
+ 'AverageThickness': row[9],
+ 'CenterLatitude': row[10],
+ 'CenterLongitude': row[11],
+ 'Accuracy': row[12]
}
# Check if measurement ID already exists in measurement_data
@@ -57,11 +57,10 @@ def get_all_markers(self, cursor, valid: bool, waterBodyName):
'TimeMeasured': row[2],
'Sensor': { # Each measurement only has one related sensor
'SensorID': row[1],
- 'SensorType': row[9],
- 'Active': bool(row[10])
+ 'SensorType': row[3],
+ 'Active': bool(row[4])
},
'SubDivision': [sub_division], # Array of sub_division objects
- 'BodyOfWater': row[14]
}
# Convert dictionary values to list of measurements
diff --git a/server/sql_db/icedb b/server/sql_db/icedb
index f4914b4c4464c891c8d94884568fc5289c996d8e..b19e3e7766c83a08ad8f1b6aa7c08743c90ab02d 100644
GIT binary patch
delta 875
zcmZ`$zi-n(6t<l<=QxRvN(B@up%WcSCD#(I)B%YhO<f4e4=J%4R>yY@S7bZ2<3L#4
zN-PWrPzJ=re^7xkGO=|5Au%v8(5V9w3t~WG;bN!3M&+cl-uv!*-+TVv{;{xsEIeD7
z%W)i+W%u-e=gQh*j#GEO<>4<b3l2Hhf$!ue@Otityq&#}dn>(=7Qo?~0|f++cC+Ao
zp&&k9>r--n&nNESTJ$Y7w4$z|?XuQF5rT?M6hBR^qLp-Hsa0ZlzDq1(_sW|J1DeG4
z95;$}YLN*6D@ck9AQXhDH!08uU7{dQEt);rXVE|8klR*khDDUKp0L{V+ncmcJ?hxw
z=2*SyI(|0_tJJ2JZ|QfbdCw-E7s^Nd<1=Bk*e9;hAu%FWOYGN(TQPdH=VLb66mjg%
z1Uh@7qG|fBVGa_nTa9`Zg`NbFYsgBxmuoexfo|8!H556CJXEj6d_^~yOQ$CPuXMw~
zgZfU(V1uJ}R39c|eC#0;X$PU335ANbrB8bQbra!8AhBsCfRnpV2(@l$4Gl&6V$`MT
zuHzX?4<&F>TjUQ4)W+n&Xj%F~=0&;7!T0bb#Bd!7@+bL~+#SuGyCdgU#0<~#fCm7i
zgyBYTCASJPd?v$kh79+DtNE4mlp=(b?CR{4GVBJ+!}Z|9ya<mt_#6I&-{A@T3O~b-
i@QAf|4KITk)*&T`=@~x5r$CqrLOM)^+0n_<OXv@xBi{%B
delta 118
zcmZp8z|`=7X@ayM7Xt$WHxR=B+e95>MJ@)tvQA$99}HYv(hU6R{0I4Z`K@?9@r7}V
z@$BZB&LzEBP+&IaW@)aMsXQ$FW(@pi`DgN{@S6dJ)%Yiy)t>{3K4akj&Hsh}E&ns1
M=r#V$&-$el0Q6oS%>V!Z
diff --git a/server/sql_db/schema.sql b/server/sql_db/schema.sql
index 864076dc..14138216 100644
--- a/server/sql_db/schema.sql
+++ b/server/sql_db/schema.sql
@@ -56,7 +56,11 @@ INSERT INTO SubDivision (MeasurementID, SubDivisionID, GroupID, MinimumThickness
(1, 1, 1, 3.2, 4.5, 60.765, 10.723, 1.2),
(1, 2, 1, 2.8, 4.3, 60.780, 10.776, 1.1),
(1, 3, 2, 4.1, 5.7, 60.768, 10.845, 1.3),
-(1, 4, 2, 3.5, 5.0, 60.749, 10.783, 1.4);
+(1, 4, 2, 3.5, 5.0, 60.749, 10.783, 1.4),
+(2, 1, 1, 4.1, 5.7, 60.768, 10.845, 1.3),
+(2, 2, 2, 3.5, 5.0, 60.749, 10.783, 1.4),
+(3, 1, 1, 4.1, 5.7, 60.768, 10.845, 1.3),
+(3, 2, 2, 3.5, 5.0, 60.749, 10.783, 1.4);
--
GitLab