Commit 5591dad7 authored by Jeremy Pallats's avatar Jeremy Pallats 💬
Browse files

Few small fixes for feature. 

- Fix update_dict test and modify creation based on optional args.
parent 55ac2aad

cog/actions.py

+2 −3
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ class Admin(Action): 
                        await scanners[name].asheet.duplicate_sheet(template, new_page)

                    except gspread.exceptions.APIError as exc:

                        logging.getLogger(__name__).error("Failed to duplicate sheet: %s\nExc: %s", name, str(exc))

                        # raise ValueError from exc

                    await scanners[name].asheet.change_worksheet(new_page)



                    if name == 'hudson_cattle':

cogdb/scanners.py

+21 −16
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ class GalScanner(FortScanner): 
        """

        raise NotImplementedError



    def update_dict(self, *, systems=[], preps=[], exps=[], vote=[], row=3):

    def update_dict(self, *, systems=[], preps=[], exps=[], vote=None, row=3):

        """

        Create an update payload to update all cells on a sheet.
@@ -962,27 +962,32 @@ class GalScanner(FortScanner): 
            first += [[name, spy_system.fort, spy_system.um]]

            second += [[name, 0, 0, spy_system.fort_trigger, spy_system.um_trigger]]

            third += [[name, spy_system.held_merits]]

        payload = [

            {'range': f'A{row}:C{end_row}', 'values': first},

            {'range': f'L{row}:P{end_row}', 'values': second},

            {'range': f'R{row}:S{end_row}', 'values': third},

        ]



        if preps:

            for spy_prep in preps:

                name = spy_prep.system_name.upper()

                prep_systems += [[name, spy_prep.merits]]

            payload += [{'range': f'D{row}:E{end_row_prep}', 'values': prep_systems}]



        if exps:

            for spy_exp in exps:

                name = spy_exp.system.name.upper()

                exp_systems_first += [[name, spy_exp.fort, spy_exp.um]]

                exp_systems_second += [[name, spy_exp.fort_trigger, spy_exp.um_trigger]]



        payload = [

            {'range': f'A{row}:C{end_row}', 'values': first},

            {'range': f'L{row}:P{end_row}', 'values': second},

            {'range': f'R{row}:S{end_row}', 'values': third},

            {'range': f'D{row}:E{end_row_prep}', 'values': prep_systems},

            payload += [

                {'range': f'F{row}:H{end_row_exp}', 'values': exp_systems_first},

                {'range': f'I{row}:K{end_row_exp}', 'values': exp_systems_second},

            {'range': 'D9:E9', 'values': [[str(vote.vote), str(100-vote.vote)]]},

            {'range': 'C1:C1', 'values': [[str(now)]]},

            ]



        if vote:

            payload += [{'range': 'D9:E9', 'values': [[str(vote.vote), str(100 - vote.vote)]]}]



        payload += [{'range': 'C1:C1', 'values': [[str(now)]]}]

        return payload



    async def clear_cells(self, *, row=3):

tests/cogdb/test_eddn.py

+0 −2
Original line number Diff line number Diff line
@@ -717,8 +717,6 @@ def test_edmcjournal_parse_station(): 


    parser.parse_system()

    result = parser.parse_station()

    __import__('pprint').pprint(result)

    __import__('pprint').pprint(expected)



    assert result == expected

tests/cogdb/test_schema.py

+0 −2
Original line number Diff line number Diff line
@@ -300,8 +300,6 @@ def test_fortsystem_priority_expression(session, f_dusers, f_fort_testbed): 




def test_fortsystem_prep(f_dusers, f_fort_testbed):

    __import__('pprint').pprint(f_fort_testbed)



    system = f_fort_testbed[1][0]

    print(system)

    assert system.is_prep is False

tests/cogdb/test_spy_squirrel.py

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ def test_fetch_json_secret(): 


def test_fetch_load_secret():

    base_json = spy.load_json_secret('base.json')

    __import__('pprint').pprint(base_json)



    assert base_json