From ff264ec808f18509d1138f756911f6a241a80391 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 12 Dec 2022 10:06:31 +0000 Subject: [PATCH] refactor(tokens-repo): simplify getting tokens get_token_by_token_string and get_token_by_name are no longer tied to json. --- .../tokens/json_tokens_repository.py | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/selfprivacy_api/repositories/tokens/json_tokens_repository.py b/selfprivacy_api/repositories/tokens/json_tokens_repository.py index aad3158..30d8021 100644 --- a/selfprivacy_api/repositories/tokens/json_tokens_repository.py +++ b/selfprivacy_api/repositories/tokens/json_tokens_repository.py @@ -25,29 +25,19 @@ DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f" class JsonTokensRepository(AbstractTokensRepository): def get_token_by_token_string(self, token_string: str) -> Optional[Token]: """Get the token by token""" - with ReadUserData(UserDataFiles.TOKENS) as tokens_file: - for userdata_token in tokens_file["tokens"]: - if userdata_token["token"] == token_string: - - return Token( - token=token_string, - device_name=userdata_token["name"], - created_at=userdata_token["date"], - ) + tokens = self.get_tokens() + for token in tokens: + if token.token == token_string: + return token raise TokenNotFound("Token not found!") def get_token_by_name(self, token_name: str) -> Optional[Token]: """Get the token by name""" - with ReadUserData(UserDataFiles.TOKENS) as tokens_file: - for userdata_token in tokens_file["tokens"]: - if userdata_token["name"] == token_name: - - return Token( - token=userdata_token["token"], - device_name=token_name, - created_at=userdata_token["date"], - ) + tokens = self.get_tokens() + for token in tokens: + if token.device_name == token_name: + return token raise TokenNotFound("Token not found!")