Skip to content
Merged

Dev #48

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/controller/admin_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,10 @@
request: Request,
skip: int = Query(0, ge=0, description="Number of records to skip"),
limit: int = Query(10, ge=1, le=100, description="Max records to return"),
email: str = Query(None, description="Filter admins by email"),
):
"""
Retrieve all admins from the database. Requires admin session.
"""
service.get_current_session_admin(request)
return service.get_admins(skip=skip, limit=limit)
return service.get_admins(skip=skip, limit=limit, email=email)

Check warning on line 283 in src/app/controller/admin_controller.py

View check run for this annotation

Codecov / codecov/patch

src/app/controller/admin_controller.py#L283

Added line #L283 was not covered by tests
15 changes: 10 additions & 5 deletions src/app/service/admin_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

from app.db.db import db
from app.models.admin import AdminCreate, AdminLogin
from app.schemas.admins import admins_entity

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -94,10 +93,16 @@

return session["email"]

def get_admins(self, skip: int = 0, limit: int = 10):
admins = admins_entity(self.admins_collection.find().skip(skip).limit(limit))
logger.info(f"[SUCCESSFUL] GET: get_admins.\n\tFetched {len(admins)} admins.")
total = self.admins_collection.count_documents({})
def get_admins(self, skip=0, limit=10, email=None):
query = {}

Check warning on line 97 in src/app/service/admin_service.py

View check run for this annotation

Codecov / codecov/patch

src/app/service/admin_service.py#L97

Added line #L97 was not covered by tests
if email:
query["email"] = {"$regex": email, "$options": "i"} # busqueda no-exacta
admins_cursor = self.admins_collection.find(query).skip(skip).limit(limit)
admins = []

Check warning on line 101 in src/app/service/admin_service.py

View check run for this annotation

Codecov / codecov/patch

src/app/service/admin_service.py#L99-L101

Added lines #L99 - L101 were not covered by tests
for admin in admins_cursor:
admin["_id"] = str(admin["_id"]) # <- conversión
admins.append(admin)
total = self.admins_collection.count_documents(query)

Check warning on line 105 in src/app/service/admin_service.py

View check run for this annotation

Codecov / codecov/patch

src/app/service/admin_service.py#L103-L105

Added lines #L103 - L105 were not covered by tests
return {"total": total, "admins": admins}

@staticmethod
Expand Down
34 changes: 34 additions & 0 deletions tests/unit/test_rule_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import pytest
from bson import ObjectId
from fastapi import HTTPException

from app.models.rule import Rule
from app.service.rule_service import RuleService
Expand Down Expand Up @@ -98,6 +99,21 @@ def test_save_new_rule(mock_conn, sample_rule, sample_rule_dict):
mock_conn.find_one.assert_called_once_with({"_id": inserted_id})


def test_save_rule_invalid_date_raises(mock_conn):
past_date = (datetime.now() - timedelta(days=1)).date()
rule = Rule(
title="Invalid Rule",
description="",
effectiveDate=past_date,
conditions=[],
)
service = RuleService()
with pytest.raises(HTTPException) as exc_info:
service.save_rule(rule, "test@email.com", "test_token")
assert exc_info.value.status_code == 400
assert "effective date must be after today" in str(exc_info.value.detail).lower()


def test_get_rule_success(mock_conn, sample_rule_dict):
rule_id = str(sample_rule_dict["_id"])
mock_conn.find_one.return_value = sample_rule_dict
Expand Down Expand Up @@ -135,6 +151,24 @@ def test_update_rule_success(mock_conn, sample_rule, sample_rule_dict):
)


def test_update_rule_invalid_date_raises(mock_conn, sample_rule_dict):
# Fecha pasada (ayer)
past_date = (datetime.now() - timedelta(days=1)).date()
rule_id = str(sample_rule_dict["_id"])
rule = Rule(
title="Invalid Rule",
description="",
effectiveDate=past_date,
conditions=[],
)
mock_conn.find_one.return_value = sample_rule_dict
service = RuleService()
with pytest.raises(HTTPException) as exc_info:
service.update_rule_by_id(rule_id, rule, "test@email.com", "test_token")
assert exc_info.value.status_code == 400
assert "effective date must be after today" in str(exc_info.value.detail).lower()


def test_delete_rule_success(mock_conn, sample_rule_dict):
rule_id = str(sample_rule_dict["_id"])
mock_conn.find_one_and_delete.return_value = sample_rule_dict
Expand Down