Fix: Login.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
"""
|
||||
Project: PARTS Website
|
||||
Project: Magic Tracker
|
||||
Author: Edward Middleton-Smith
|
||||
Precision And Research Technology Systems Limited
|
||||
Shuffle & Skirmish
|
||||
|
||||
Technology: Business Objects
|
||||
Feature: MTG Deck Business Object
|
||||
@@ -17,7 +17,7 @@ from helpers.helper_app import Helper_App
|
||||
# external
|
||||
from dataclasses import dataclass
|
||||
from typing import ClassVar
|
||||
from sqlalchemy.types import Text, Boolean
|
||||
from sqlalchemy.types import Text, Boolean, Integer
|
||||
|
||||
|
||||
class MTG_Deck(SQLAlchemy_ABC, Base):
|
||||
@@ -108,36 +108,40 @@ class MTG_Deck(SQLAlchemy_ABC, Base):
|
||||
|
||||
|
||||
class Parameters_MTG_Deck(Get_Many_Parameters_Base):
|
||||
access_user_id: int
|
||||
get_all_deck: bool
|
||||
get_inactive_deck: bool
|
||||
deck_ids: str
|
||||
deck_names: str
|
||||
commander_bracket_ids: str
|
||||
include_commander_option: bool
|
||||
created_by_user_ids: str
|
||||
get_all_game: bool
|
||||
get_inactive_game: bool
|
||||
game_ids: str
|
||||
filter_by_game_session_not_player: bool
|
||||
get_all_user: bool
|
||||
get_inactive_user: bool
|
||||
user_ids: str
|
||||
require_all_id_filters_met: bool
|
||||
require_any_id_filters_met: bool
|
||||
require_all_non_id_filters_met: bool
|
||||
require_any_non_id_filters_met: bool
|
||||
|
||||
@classmethod
|
||||
def get_default(cls, user_id):
|
||||
def get_default(cls, user_id_session):
|
||||
return cls(
|
||||
get_all_deck = False
|
||||
access_user_id = user_id_session
|
||||
, get_all_deck = False
|
||||
, get_inactive_deck = False
|
||||
, deck_ids = ''
|
||||
, deck_names = ''
|
||||
, commander_bracket_ids = ''
|
||||
, include_commander_option = True
|
||||
, created_by_user_ids = str(user_id)
|
||||
, get_all_game = False
|
||||
, get_all_game = True
|
||||
, get_inactive_game = False
|
||||
, game_ids = ''
|
||||
, filter_by_game_session_not_player = False
|
||||
, get_all_user = True
|
||||
, get_inactive_user = False
|
||||
, user_ids = ''
|
||||
, require_all_id_filters_met = False
|
||||
, require_any_id_filters_met = True
|
||||
, require_all_non_id_filters_met = False
|
||||
@@ -147,17 +151,19 @@ class Parameters_MTG_Deck(Get_Many_Parameters_Base):
|
||||
@classmethod
|
||||
def from_json(cls, json):
|
||||
return cls(
|
||||
get_all_deck = json.get('a_get_all_deck', False)
|
||||
access_user_id = json.get('a_access_user_id', None)
|
||||
, get_all_deck = json.get('a_get_all_deck', False)
|
||||
, get_inactive_deck = json.get('a_get_inactive_deck', False)
|
||||
, deck_ids = json.get('a_deck_ids', '')
|
||||
, deck_names = json.get('a_deck_names', '')
|
||||
, commander_bracket_ids = json.get('a_commander_bracket_ids', '')
|
||||
, include_commander_option = json.get('a_include_commander_option', True)
|
||||
, created_by_user_ids = json.get('a_created_by_user_ids', '')
|
||||
, get_all_game = json.get('a_get_all_game', False)
|
||||
, get_inactive_game = json.get('a_get_inactive_game', False)
|
||||
, game_ids = json.get('a_game_ids', '')
|
||||
, filter_by_game_session_not_player = json.get('a_filter_by_game_session_not_player', True)
|
||||
, get_all_user = json.get('a_get_all_user', False)
|
||||
, get_inactive_user = json.get('a_get_inactive_user', False)
|
||||
, user_ids = json.get('a_user_ids', '')
|
||||
, require_all_id_filters_met = json.get('a_require_all_id_filters_met', True)
|
||||
, require_any_id_filters_met = json.get('a_require_any_id_filters_met', True)
|
||||
, require_all_non_id_filters_met = json.get('a_require_all_non_id_filters_met', False)
|
||||
@@ -166,17 +172,19 @@ class Parameters_MTG_Deck(Get_Many_Parameters_Base):
|
||||
|
||||
def to_json(self):
|
||||
return {
|
||||
'a_get_all_deck': self.get_all_deck
|
||||
'a_access_user_id': self.access_user_id
|
||||
, 'a_get_all_deck': self.get_all_deck
|
||||
, 'a_get_inactive_deck': self.get_inactive_deck
|
||||
, 'a_deck_ids': self.deck_ids
|
||||
, 'a_deck_names': self.deck_names
|
||||
, 'a_commander_bracket_ids': self.commander_bracket_ids
|
||||
, 'a_include_commander_option': self.include_commander_option
|
||||
, 'a_created_by_user_ids': self.created_by_user_ids
|
||||
, 'a_get_all_game': self.get_all_game
|
||||
, 'a_get_inactive_game': self.get_inactive_game
|
||||
, 'a_game_ids': self.game_ids
|
||||
, 'a_filter_by_game_session_not_player': self.filter_by_game_session_not_player
|
||||
, 'a_get_all_user': self.get_all_user
|
||||
, 'a_get_inactive_user': self.get_inactive_user
|
||||
, 'a_user_ids': self.user_ids
|
||||
, 'a_require_all_id_filters_met': self.require_all_id_filters_met
|
||||
, 'a_require_any_id_filters_met': self.require_any_id_filters_met
|
||||
, 'a_require_all_non_id_filters_met': self.require_all_non_id_filters_met
|
||||
@@ -186,17 +194,19 @@ class Parameters_MTG_Deck(Get_Many_Parameters_Base):
|
||||
@staticmethod
|
||||
def get_type_hints():
|
||||
return {
|
||||
'a_get_all_deck': Boolean
|
||||
'a_access_user_id': Integer
|
||||
, 'a_get_all_deck': Boolean
|
||||
, 'a_get_inactive_deck': Boolean
|
||||
, 'a_deck_ids': Text
|
||||
, 'a_deck_names': Text
|
||||
, 'a_commander_bracket_ids': Text
|
||||
, 'a_include_commander_option': Boolean
|
||||
, 'a_created_by_user_ids': Text
|
||||
, 'a_get_all_game': Boolean
|
||||
, 'a_get_inactive_game': Boolean
|
||||
, 'a_game_ids': Text
|
||||
, 'a_filter_by_game_session_not_player': Boolean
|
||||
, 'a_get_all_user': Boolean
|
||||
, 'a_get_inactive_user': Boolean
|
||||
, 'a_user_ids': Text
|
||||
, 'a_require_all_id_filters_met': Boolean
|
||||
, 'a_require_any_id_filters_met': Boolean
|
||||
, 'a_require_all_non_id_filters_met': Boolean
|
||||
|
||||
Reference in New Issue
Block a user