Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.

2017-05-07 02:02:54 -04:00
parent f9b7376cc7
commit 1604ea1f2c
8 changed files with 112 additions and 45 deletions
--- a/eos/db/saveddata/cargo.py
+++ b/eos/db/saveddata/cargo.py
@@ -18,11 +18,12 @@
 # ===============================================================================

 from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import mapper, relation
 import sqlalchemy.sql.functions as func

 from eos.db import saveddata_meta
 from eos.saveddata.cargo import Cargo
+from eos.saveddata.fit import Fit

 cargo_table = Table("cargo", saveddata_meta,
                    Column("ID", Integer, primary_key=True),
@@ -33,4 +34,8 @@ cargo_table = Table("cargo", saveddata_meta,
                    Column("modified", DateTime, nullable=True, onupdate=func.now()),
                    )

-mapper(Cargo, cargo_table)
+mapper(Cargo, cargo_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)
--- a/eos/db/saveddata/drone.py
+++ b/eos/db/saveddata/drone.py
@@ -18,11 +18,12 @@
 # ===============================================================================

 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import mapper, relation
 import sqlalchemy.sql.functions as func

 from eos.db import saveddata_meta
 from eos.saveddata.drone import Drone
+from eos.saveddata.fit import Fit

 drones_table = Table("drones", saveddata_meta,
                     Column("groupID", Integer, primary_key=True),
@@ -35,4 +36,8 @@ drones_table = Table("drones", saveddata_meta,
                     Column("modified", DateTime, nullable=True, onupdate=func.now())
                     )

-mapper(Drone, drones_table)
+mapper(Drone, drones_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)
--- a/eos/db/saveddata/fit.py
+++ b/eos/db/saveddata/fit.py
@@ -58,8 +58,9 @@ fits_table = Table("fits", saveddata_meta,
                   Column("modeID", Integer, nullable=True),
                   Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
                   Column("notes", String, nullable=True),
+                   Column("ignoreRestrictions", Boolean, default=0),
                   Column("created", DateTime, nullable=True, default=func.now()),
-                   Column("modified", DateTime, nullable=True, onupdate=func.now())
+                   Column("modified", DateTime, nullable=True, default=func.now(), onupdate=func.now())
                   )

 projectedFits_table = Table("projectedFits", saveddata_meta,
@@ -142,49 +143,70 @@ es_Fit._Fit__commandFits = association_proxy(
        "booster_fit",  # .. and return the booster fit
        creator=lambda boosterID, booster_fit: CommandFit(boosterID, booster_fit)
 )
+
+
+# These relationships are broken out so that we can easily access it in the events stuff
+# We sometimes don't want particular relationships to cause a fit modified update (eg: projecting
+# a fit onto another would 'modify' both fits unless the following relationship is ignored)
+projectedFitSourceRel = relationship(
+   ProjectedFit,
+   primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+   backref='source_fit',
+   collection_class=attribute_mapped_collection('victimID'),
+   cascade='all, delete, delete-orphan')
+
+
+boostedOntoRel = relationship(
+   CommandFit,
+   primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
+   backref='booster_fit',
+   collection_class=attribute_mapped_collection('boostedID'),
+   cascade='all, delete, delete-orphan')
+
 mapper(es_Fit, fits_table,
       properties={
-           "_Fit__modules"          : relation(
+           "_Fit__modules": relation(
                   Module,
                   collection_class=HandledModuleList,
                   primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),  # noqa
                   order_by=modules_table.c.position,
                   cascade='all, delete, delete-orphan'),
-           "_Fit__projectedModules" : relation(
+           "_Fit__projectedModules": relation(
                   Module,
                   collection_class=HandledProjectedModList,
                   cascade='all, delete, delete-orphan',
                   single_parent=True,
                   primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),  # noqa
-           "owner"                  : relation(
+           "owner": relation(
                   User,
                   backref="fits"),
-           "itemID"                 : fits_table.c.shipID,
-           "shipID"                 : fits_table.c.shipID,
-           "_Fit__boosters"         : relation(
+           "itemID": fits_table.c.shipID,
+           "shipID": fits_table.c.shipID,
+           "_Fit__boosters": relation(
                   Booster,
                   collection_class=HandledImplantBoosterList,
                   cascade='all, delete, delete-orphan',
+                   backref='owner',
                   single_parent=True),
-           "_Fit__drones"           : relation(
+           "_Fit__drones": relation(
                   Drone,
                   collection_class=HandledDroneCargoList,
                   cascade='all, delete, delete-orphan',
                   single_parent=True,
                   primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),  # noqa
-           "_Fit__fighters"         : relation(
+           "_Fit__fighters": relation(
                   Fighter,
                   collection_class=HandledDroneCargoList,
                   cascade='all, delete, delete-orphan',
                   single_parent=True,
                   primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),  # noqa
-           "_Fit__cargo"            : relation(
+           "_Fit__cargo": relation(
                   Cargo,
                   collection_class=HandledDroneCargoList,
                   cascade='all, delete, delete-orphan',
                   single_parent=True,
                   primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
-           "_Fit__projectedDrones"  : relation(
+           "_Fit__projectedDrones": relation(
                   Drone,
                   collection_class=HandledProjectedDroneList,
                   cascade='all, delete, delete-orphan',
@@ -196,46 +218,36 @@ mapper(es_Fit, fits_table,
                   cascade='all, delete, delete-orphan',
                   single_parent=True,
                   primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),  # noqa
-           "_Fit__implants"         : relation(
+           "_Fit__implants": relation(
                   Implant,
                   collection_class=HandledImplantBoosterList,
                   cascade='all, delete, delete-orphan',
-                   backref='fit',
+                   backref='owner',
                   single_parent=True,
                   primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
                   secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
                   secondary=fitImplants_table),
-           "_Fit__character"        : relation(
+           "_Fit__character": relation(
                   Character,
                   backref="fits"),
-           "_Fit__damagePattern"    : relation(DamagePattern),
-           "_Fit__targetResists"    : relation(TargetResists),
-           "projectedOnto"          : relationship(
-                   ProjectedFit,
-                   primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
-                   backref='source_fit',
-                   collection_class=attribute_mapped_collection('victimID'),
-                   cascade='all, delete, delete-orphan'),
-           "victimOf"               : relationship(
+           "_Fit__damagePattern": relation(DamagePattern),
+           "_Fit__targetResists": relation(TargetResists),
+           "projectedOnto": projectedFitSourceRel,
+           "victimOf": relationship(
                   ProjectedFit,
                   primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
                   backref='victim_fit',
                   collection_class=attribute_mapped_collection('sourceID'),
                   cascade='all, delete, delete-orphan'),
-           "boostedOnto"            : relationship(
-                   CommandFit,
-                   primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
-                   backref='booster_fit',
-                   collection_class=attribute_mapped_collection('boostedID'),
-                   cascade='all, delete, delete-orphan'),
-           "boostedOf"              : relationship(
+           "boostedOnto": boostedOntoRel,
+           "boostedOf": relationship(
                   CommandFit,
                   primaryjoin=fits_table.c.ID == commandFits_table.c.boostedID,
                   backref='boosted_fit',
                   collection_class=attribute_mapped_collection('boosterID'),
                   cascade='all, delete, delete-orphan'),
       }
-       )
+)

 mapper(ProjectedFit, projectedFits_table,
       properties={
@@ -244,5 +256,3 @@ mapper(ProjectedFit, projectedFits_table,
 )

 mapper(CommandFit, commandFits_table)
-
-