Browse Source

Fix regio for new factory

JoostSijm 5 năm trước cách đây
mục cha
commit
bb251e923e
3 tập tin đã thay đổi với 2 bổ sung4 xóa
  1. 1 1
      app/__init__.py
  2. 0 1
      app/__main__.py
  3. 1 2
      app/database.py

+ 1 - 1
app/__init__.py

@@ -21,7 +21,7 @@ SESSION = sessionmaker(bind=ENGINE)
 SCHEDULER = BackgroundScheduler(
     daemon=True,
     job_defaults={
-    	'misfire_grace_time': 900
+        'misfire_grace_time': 900
     },
 )
 SCHEDULER.start()

+ 0 - 1
app/__main__.py

@@ -24,7 +24,6 @@ def job_update_factories(state_id):
         factories = get_factories(region.id)
         LOGGER.info('"%s": "%s" factories', region.name, len(factories))
         factory_list += factories
-        print_factories(factories)
 
     save_factories(state_id, factory_list)
     LOGGER.info('"%s": done saving factories', state.name)

+ 1 - 2
app/database.py

@@ -56,7 +56,7 @@ def save_factories(state_id, factories):
 
         if not current_location or current_location.region_id != factory_dict['region_id']:
             region = session.query(Region) \
-                .filter(Region.name == factory_dict['region_name']).first()
+                .filter(Region.id == factory_dict['region_id']).first()
             factory_location = FactoryLocation()
             factory_location.factory_id = factory.id
             factory_location.region_id = region.id
@@ -74,6 +74,5 @@ def save_factory(session, factory_dict):
     factory = Factory()
     factory.id = factory_dict['id']
     factory.name = factory_dict['name']
-    factory.resource_type = factory_dict['resource_type']
     session.add(factory)
     return factory