Commit 5ed9f40d authored by Jeremy Pallats's avatar Jeremy Pallats 💬
Browse files

FIX #114: Priority and Deferred List Should Not Return Fortified Systems 

- Simply ensure it by filtering in query.
parent 65e633dc

cogdb/query.py

+2 −0
Original line number Diff line number Diff line
@@ -374,10 +374,12 @@ def fort_get_priority_targets(session): 
    """

    priority = session.query(FortSystem).\

        filter(sqla.not_(FortSystem.is_skipped),

               sqla.not_(FortSystem.is_fortified),

               FortSystem.is_priority).\

        all()

    deferred = session.query(FortSystem).\

        filter(sqla.not_(FortSystem.is_skipped),

               sqla.not_(FortSystem.is_fortified),

               FortSystem.is_deferred).\

        all()

tests/cogdb/test_query.py

+4 −0
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ def test_fort_get_systems_x_left(session, f_dusers, f_fort_testbed): 




def test_fort_get_priority_targets(session, f_dusers, f_fort_testbed):

    session.add(

        FortSystem(id=11, name='PriorityForted', fort_status=9000, trigger=8563, notes='Priority For S/M Ships', sheet_col='BZ', sheet_order=58)

    )

    session.commit()

    priority, deferred = cogdb.query.fort_get_priority_targets(session)

    assert priority[0].name == 'Othime'

    assert len(priority) == 1