Skip to content
This repository was archived by the owner on Oct 5, 2024. It is now read-only.

Commit c8d22f2

Browse files
emi420emi420
committed
Replace created_at for closed_at on Python DB API
1 parent 026ef9d commit c8d22f2

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎python/dbapi/api/raw.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
# Order by
3232
class OrderBy(Enum):
33-
createdAt = "created_at"
33+
closedAt = "closed_at"
3434
id = "id"
3535
timestamp = "timestamp"
3636

@@ -73,7 +73,7 @@ def geoFeaturesQuery(params: RawFeaturesParamsDTO, asJson: bool = False):
7373
tags, \n \
7474
hashtags, \n \
7575
editor, \n \
76-
created_at \n \
76+
closed_at \n \
7777
FROM {table} \n \
7878
LEFT JOIN changesets c ON c.id = {table}.changeset \n \
7979
WHERE{area}{tags}{hashtag}{date} {limit}; \n \
@@ -84,7 +84,7 @@ def geoFeaturesQuery(params: RawFeaturesParamsDTO, asJson: bool = False):
8484
.format(area=params.area) if params.area else "",
8585
tags=" AND (" + tagsQueryFilter(params.tags, params.table.value) + ") \n" if params.tags else "",
8686
hashtag=" AND " + hashtagQueryFilter(params.hashtag, params.table.value) if params.hashtag else "",
87-
date=" AND created_at >= {dateFrom} AND created_at <= {dateTo}\n"
87+
date=" AND closed_at >= {dateFrom} AND closed_at <= {dateTo}\n"
8888
.format(dateFrom=params.dateFrom, dateTo=params.dateTo)
8989
if params.dateFrom and params.dateTo else "\n",
9090
limit=" LIMIT {limit}".format(limit=RESULTS_PER_PAGE)
@@ -115,7 +115,7 @@ def listFeaturesQuery(
115115
{table}.timestamp, \n \
116116
tags, \n \
117117
{table}.changeset, \n \
118-
c.created_at \n \
118+
c.closed_at \n \
119119
FROM {table} \n \
120120
LEFT JOIN changesets c ON c.id = {table}.changeset \n \
121121
WHERE{fromDate}{toDate}{hashtag}{area}{tags}{order} \
@@ -124,8 +124,8 @@ def listFeaturesQuery(
124124
type=osmType.value,
125125
geotype=geoType.value,
126126
table=table.value,
127-
fromDate=" AND created_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
128-
toDate=" AND created_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
127+
fromDate=" AND closed_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
128+
toDate=" AND closed_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
129129
hashtag=" AND " + hashtagQueryFilter(params.hashtag, table.value) if params.hashtag else "",
130130
area=" AND ST_Intersects(\"geom\", ST_GeomFromText('MULTIPOLYGON((({area})))', 4326) )"
131131
.format(
@@ -152,7 +152,7 @@ def listQueryToJSON(query: str, params: ListFeaturesParamsDTO):
152152
predata.timestamp, \n \
153153
tags, \n \
154154
predata.changeset, \n \
155-
predata.created_at as created_at, \n \
155+
predata.closed_at as closed_at, \n \
156156
lat, \n \
157157
lon \n \
158158
from predata \n \
@@ -163,10 +163,10 @@ def listQueryToJSON(query: str, params: ListFeaturesParamsDTO):
163163
) SELECT jsonb_agg(t_features.feature) as result FROM t_features;" \
164164
.format(
165165
query=query,
166-
date="created_at >= '{dateFrom}' AND created_at <= '{dateTo}'"
166+
date="closed_at >= '{dateFrom}' AND closed_at <= '{dateTo}'"
167167
.format(
168168
dateFrom=params.dateFrom if (params.dateFrom) else "",
169-
dateTo=" AND created_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else ""
169+
dateTo=" AND closed_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else ""
170170
) if params.dateFrom and params.dateTo else "",
171171
orderBy=" AND {orderBy} IS NOT NULL ORDER BY {orderBy} DESC"
172172
.format(

‎python/dbapi/api/rawValidation.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ def countQuery(
9292
) \
9393
select count, total from count_validated_features, count_features".format(
9494
table=params.table.value,
95-
dateFrom=" AND created_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
96-
dateTo=" AND created_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
95+
dateFrom=" AND closed_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
96+
dateTo=" AND closed_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
9797
area=" AND ST_Intersects(\"geom\", ST_GeomFromText('MULTIPOLYGON((({area})))', 4326) )".format(area=params.area) if params.area else "",
9898
tags=" AND (" + tagsQueryFilter(params.tags, params.table.value) + ") \n" if params.tags else "",
9999
hashtag=" AND " + hashtagQueryFilter(params.hashtag, params.table.value) if params.hashtag else "",
@@ -115,7 +115,7 @@ def geoFeaturesQuery(params: RawValidationFeaturesParamsDTO, asJson: bool = Fals
115115
status, \n \
116116
hashtags, \n \
117117
editor, \n \
118-
created_at \n \
118+
closed_at \n \
119119
FROM {table} \n \
120120
LEFT JOIN changesets c ON c.id = {table}.changeset \n \
121121
LEFT JOIN validation ON validation.osm_id = {table}.osm_id \
@@ -127,7 +127,7 @@ def geoFeaturesQuery(params: RawValidationFeaturesParamsDTO, asJson: bool = Fals
127127
.format(area=params.area) if params.area else "",
128128
tags=" AND (" + tagsQueryFilter(params.tags, params.table.value) + ") \n" if params.tags else "",
129129
hashtag=" AND " + hashtagQueryFilter(params.hashtag, params.table.value) if params.hashtag else "",
130-
date=" AND created_at >= {dateFrom} AND created_at <= {dateTo}\n"
130+
date=" AND closed_at >= {dateFrom} AND closed_at <= {dateTo}\n"
131131
.format(dateFrom=params.dateFrom, dateTo=params.dateTo)
132132
if params.dateFrom and params.dateTo else "\n",
133133
status=" AND status = '{status}'".format(status=params.status.value) if (params.status) else "",
@@ -159,7 +159,7 @@ def listFeaturesQuery(
159159
{table}.timestamp, \n \
160160
tags, \n \
161161
{table}.changeset, \n \
162-
c.created_at, \n \
162+
c.closed_at, \n \
163163
status \n \
164164
FROM {table} \n \
165165
LEFT JOIN changesets c ON c.id = {table}.changeset \n \
@@ -170,8 +170,8 @@ def listFeaturesQuery(
170170
type=osmType.value,
171171
geotype=geoType.value,
172172
table=table.value,
173-
fromDate=" AND created_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
174-
toDate=" AND created_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
173+
fromDate=" AND closed_at >= '{dateFrom}'".format(dateFrom=params.dateFrom) if (params.dateFrom) else "",
174+
toDate=" AND closed_at <= '{dateTo}'".format(dateTo=params.dateTo) if (params.dateTo) else "",
175175
hashtag=" AND " + hashtagQueryFilter(params.hashtag, table.value) if params.hashtag else "",
176176
area=" AND ST_Intersects(\"geom\", ST_GeomFromText('MULTIPOLYGON((({area})))', 4326) )"
177177
.format(

‎python/dbapi/api/stats.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def featureCountQuery(params: StatsParamsDTO, asJson: bool = False):
4444
.format(area=params.area) if params.area else "",
4545
tags=" AND (" + tagsQueryFilter(params.tags, params.table.value) + ") \n" if params.tags else "",
4646
hashtag=" AND " + hashtagQueryFilter(params.hashtag, params.table.value) if params.hashtag else "",
47-
date=" AND created_at >= {dateFrom} AND created_at <= {dateTo}\n"
47+
date=" AND closed_at >= {dateFrom} AND closed_at <= {dateTo}\n"
4848
.format(dateFrom=params.dateFrom, dateTo=params.dateTo)
4949
if params.dateFrom and params.dateTo else "\n"
5050
).replace("WHERE AND", "WHERE")

0 commit comments

Comments
 (0)