remove none if in secondary index gets

aws-samples · Jun 27, 2024 · e222c51 · e222c51
1 parent f4993ed
commit e222c51
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/users/src/users_service/repository.py b/src/users/src/users_service/repository.py
@@ -203,9 +203,7 @@ def get_user_by_username(username: str) -> Optional[User]:
             KeyConditionExpression=Key('username').eq(username)
         )
         items = response.get('Items', [])
-        return User.from_dict(items[0]) if items else None
-    except User.dynamodb.meta.client.exceptions.ResourceNotFoundException: 
-        return User()
+        return User.from_dict(items[0])
     except ClientError as e:
         current_app.logger.error(f"Error getting user by username: {str(e)}")
         return None
@@ -217,9 +215,7 @@ def get_user_by_identity_id(identity_id: str) -> Optional[User]:
             KeyConditionExpression=Key('identity_id').eq(identity_id)
         )
         items = response.get('Items', [])
-        return User.from_dict(items[0]) if items else None
-    except User.dynamodb.meta.client.exceptions.ResourceNotFoundException:
-        return User()
+        return User.from_dict(items[0])
     except ClientError as e:
         current_app.logger.error(f"Error getting user by identity_id: {str(e)}")
         return None