Ongoing enhancements

sustApp/member_map.py

@@ -1,28 +1,28 @@
 # import the library and its Marker clusterization service
 import folium
-from database import SessionLocal
+from models.database import SessionLocal
 from folium.plugins import MarkerCluster
-import models
+from models.models import Base, Members, Payments, Deliveries
 import logging
-from geopy.geocoders import Bing
+from geopy.geocoders import Nominatim
 from sqlalchemy import *
 import logging
 import webbrowser
 import re
 from config_loader import load_config
 
-def payment_slip_delivered(member: models.Members, year: int):
-    return db.query(models.Deliveries.delivery_date)\
-             .filter(models.Deliveries.member_id == member.id, extract('year', models.Deliveries.delivery_date) == year)\
+def payment_slip_delivered(member: Members, year: int):
+    return db.query(Deliveries.delivery_date)\
+             .filter(Deliveries.member_id == member.id, extract('year', Deliveries.delivery_date) == year)\
              .count()
 
-def payment_made(member: models.Members, year: int):
-    return db.query(models.Payments.payment_year)\
-             .filter(models.Payments.member_id == member.id, extract('year', models.Payments.payment_year) == year)\
+def payment_made(member: Members, year: int):
+    return db.query(Payments.payment_year)\
+             .filter(Payments.member_id == member.id, extract('year', Payments.payment_year) == year)\
              .count()
 
 def update_missing_locs():
-    members = db.query(models.Members).filter(models.Members.member_geo_latitude == None).all()
+    members = db.query(Members).filter(Members.member_geo_latitude == None).all()
 
     for member in members:
         address = f'{member.member_street} {member.member_streetnumber}, {member.member_zip} {member.member_city}, Austria'
@@ -57,8 +57,8 @@ year = cfg['year']
 
 logger = logging.getLogger(__name__)
 
-#geolocator = Nominatim(user_agent="sust", timeout=10)
-geolocator = Bing(api_key='ApbTfEJ024nQCu6DC7TPIlqAcRMfZT8lPjAyMnVRcmo9rqxde5x-IS4fW-nGu0FI')
+geolocator = Nominatim(user_agent="sust", timeout=10)
+#geolocator = Bing(api_key='ApbTfEJ024nQCu6DC7TPIlqAcRMfZT8lPjAyMnVRcmo9rqxde5x-IS4fW-nGu0FI')
 
 db = SessionLocal()
 #models.Base.metadata.create_all(bind=engine)
@@ -73,13 +73,13 @@ for member in members:
     for delivery in members.deliveries:
         print(f'{delivery.delivery_date}') """
 
-members = db.query(models.Members.member_geo_latitude, 
-                   models.Members.member_geo_longitude, 
-                   models.Members.member_firstname, 
-                   models.Members.member_surname, 
-                   models.Members.id,
-                   models.Members.member_email)\
-            .filter(models.Members.member_geo_latitude != None, models.Members.member_count != 0)\
+members = db.query(Members.member_geo_latitude, 
+                   Members.member_geo_longitude, 
+                   Members.member_firstname, 
+                   Members.member_surname, 
+                   Members.id,
+                   Members.member_email)\
+            .filter(Members.member_geo_latitude != None, Members.member_count != 0)\
             .all()
 
 # .join(models.Members.member_deliveries)\