Fixed broken logbook test

ogn/collect/logbook.py

@@ -112,7 +112,8 @@ def update_logbook(session=None):
                         and_(Logbook.takeoff_airport_id == null(),
                              Logbook.landing_airport_id == union_query.c.landing_airport_id,
                              Logbook.landing_timestamp == union_query.c.landing_timestamp)))) \
-        .values({"takeoff_timestamp": union_query.c.takeoff_timestamp,
+        .values({"reftime": union_query.c.reftime,
+                 "takeoff_timestamp": union_query.c.takeoff_timestamp,
                  "takeoff_track": union_query.c.takeoff_track,
                  "takeoff_airport_id": union_query.c.takeoff_airport_id,
                  "landing_timestamp": union_query.c.landing_timestamp,
@@ -152,7 +153,7 @@ def update_logbook(session=None):
     session.commit()
     logger.debug("New logbook entries: {}".format(insert_counter))
 
-    return "Logbook entries: {} inserted, {} updated".format(update_counter, insert_counter)
+    return "Logbook entries: {} inserted, {} updated".format(insert_counter, update_counter)
 
 
 @app.task

ogn/model/device.py

@@ -16,8 +16,6 @@ class Device(Base):
     software_version = Column(Float)
     hardware_version = Column(SmallInteger)
     real_address = Column(String(6))
-    firstseen = Column(DateTime, index=True)
-    lastseen = Column(DateTime, index=True)
 
     # Relations
     aircraft_beacons = relationship('AircraftBeacon')