Skip to content

Commit

Permalink
fix(Cost Surface): Fixes a bug in the insertion of Cost Surface PUs f…
Browse files Browse the repository at this point in the history
…or projects without a shapefile

Also includes script to fix incorrect pu data in the DB
  • Loading branch information
KevSanchez committed Jan 17, 2024
1 parent 067e2ea commit 4c0e849
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ grid.geom
SELECT ppu.id, round(pug.area / 1000000) as area, $1
FROM projects_pu ppu
INNER JOIN planning_units_geom pug ON pug.id = ppu.geom_id
WHERE ppu.geom_id = $2
WHERE ppu.geom_id = $2 AND ppu.project_id = $3
`,
[job.data.costSurfaceId, geometryId],
[job.data.costSurfaceId, geometryId, job.data.projectId],
);
});
},
Expand Down
85 changes: 85 additions & 0 deletions data/scripts/cost-surface/cost-surface-incorrect-pu-data-purge.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import psycopg2


dry_run = False

# Connect to Database 1
api_db = psycopg2.connect(
host="localhost",
database="marxan-api",
user="marxan-api",
password="marxan-api",
port=3432
)

# Connect to Database 2
geo_db = psycopg2.connect(
host="localhost",
database="marxan-geo-api",
user="marxan-geo-api",
password="marxan-geo-api",
port=3433
)

# Initialize the cursor for api_db
cur_api_db = api_db.cursor()
cur_geo_db = geo_db.cursor()

try:

cur_api_db.execute("BEGIN;")
cur_geo_db.execute("BEGIN;")

cur_geo_db.execute(''' select cspd.cost_surface_id
from cost_surface_pu_data cspd
inner join projects_pu pp on pp.id = cspd.projects_pu_id
group by cspd.cost_surface_id
having count(distinct pp.project_id) > 1 ''')
incorrect_cost_surfaces = cur_geo_db.fetchall()

for cost_surface in incorrect_cost_surfaces:
cost_surface_id = cost_surface

cur_api_db.execute( '''select project_id from cost_surfaces where id = %s ''', (cost_surface_id),)
project = cur_api_db.fetchone() # Retrieve the project id that the cost surface is associated to

if project is None:
#It can happen that the cost surface has been deleted, but there's dangling data because most probably
#the clean up process doesn't account for this incorrect pu data that has leaked into cost_surface_pu_data
print('Cost Surface ', cost_surface_id, ' not found on API')
delete_incorrect_pu_data_sql = '''
DELETE FROM cost_surface_pu_data cspd
USING projects_pu pp
WHERE pp.id = cspd.projects_pu_id AND cspd.cost_surface_id = %s
RETURNING pp.project_id
'''
cur_geo_db.execute(delete_incorrect_pu_data_sql, (cost_surface_id))
else:
project_id = project
delete_incorrect_pu_data_sql = '''
DELETE FROM cost_surface_pu_data cspd
USING projects_pu pp
WHERE pp.id = cspd.projects_pu_id AND cspd.cost_surface_id = %s AND NOT pp.project_id = %s
RETURNING pp.project_id
'''
cur_geo_db.execute(delete_incorrect_pu_data_sql, (cost_surface_id, project_id))

deleted_rows = cur_geo_db.fetchall()

print("Successfully purged ", len(deleted_rows), " rows of incorrect pu data for Cost Surface: ", cost_surface_id)


if dry_run is False:
cur_api_db.execute("COMMIT;")
cur_geo_db.execute("COMMIT;")
else:
cur_api_db.execute("ROLLBACK;")
cur_geo_db.execute("ROLLBACK;")

print("Successfully purged all incorrect Cost Surface pu data")


except Exception as e:
print(f"An error occurred: {e}")
cur_api_db.execute("ROLLBACK;")
cur_geo_db.execute("ROLLBACK;")

1 comment on commit 4c0e849

@vercel
Copy link

@vercel vercel bot commented on 4c0e849 Jan 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

marxan – ./

marxan-git-develop-vizzuality1.vercel.app
marxan-vizzuality1.vercel.app
marxan23.vercel.app

Please sign in to comment.