init-schools: db.School a db.Place se nyní musí joinovat

bin/init-schools

@@ -63,7 +63,13 @@ def import_schools(path: Path, nuts: str):
             else:
                 assert False, f"Neznámý druh školy: {druh}"
 
-            school = session.query(db.School).filter_by(level=4, parent=town.place_id, red_izo=red_izo, address=addr2).first()
+            school = (session.query(db.School)
+                      .join(db.Place)
+                      .filter(db.Place.level == 4)
+                      .filter(db.Place.parent == town.place_id)
+                      .filter(db.School.red_izo == red_izo)
+                      .filter(db.School.address == addr2)
+                      .first())
             if school:
                 assert school.official_name == nazev
                 if is_zs:
@@ -71,11 +77,13 @@ def import_schools(path: Path, nuts: str):
                 else:
                     school.is_ss = True
             else:
-                school = db.School(
+                place = db.Place(
                     level=4,
                     parent=town.place_id,
                     name=nazev,
-                    type=db.PlaceType.school,
+                    type=db.PlaceType.school)
+                school = db.School(
+                    place=place,
                     red_izo=red_izo,
                     official_name=nazev,
                     address=addr2,