Skip to content
Merged

Dev #52

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
5 changes: 2 additions & 3 deletions src/app/controller/admin_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,11 @@
)
def get_admins(
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"),
page: int = Query(1, ge=1, description="Page number (starts from 1)"),
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, email=email)
return service.get_admins(page=page, email=email)

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

View check run for this annotation

Codecov / codecov/patch

src/app/controller/admin_controller.py#L282

Added line #L282 was not covered by tests
15 changes: 7 additions & 8 deletions src/app/controller/rule_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,17 @@
},
)
def get_rules(
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"),
page: int = Query(1, ge=1, description="Page number (starts from 1)"),
date_order: str = Query("desc", description="Order of rules, 'asc' or 'desc'"),
):
"""
Retrieve all rules from the database.
query parameters:
- skip: Number of records to skip (default: 0)
- limit: Max records to return (default: 10, max: 100)
- date_order: Order of logs, 'asc' or 'desc' (default: 'desc')
Retrieve a paginated list of rules.

Query parameters:
- **page**: Page number (starts from 1)
- **date_order**: Order of rules by date ('asc' or 'desc')
"""
return service.get_rules(skip=skip, limit=limit, date_order=date_order)
return service.get_rules(page=page, date_order=date_order)

Check warning on line 49 in src/app/controller/rule_controller.py

View check run for this annotation

Codecov / codecov/patch

src/app/controller/rule_controller.py#L49

Added line #L49 was not covered by tests


@rule.post(
Expand Down
7 changes: 5 additions & 2 deletions src/app/service/admin_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
self.admin_secret = os.environ.get("ADMIN_SERVICE_SECRET", admin_secret)
self.sessions_collection = db.get_collection("sessions")
self.admins_collection = db.get_collection("admin")
self.limit = 10

def create(self, admin: AdminCreate):
if self.admins_collection.find_one({"email": admin.email}):
Expand Down Expand Up @@ -93,11 +94,13 @@

return session["email"]

def get_admins(self, skip=0, limit=10, email=None):
def get_admins(self, page=1, email=None):
query = {}
if email:
query["email"] = {"$regex": email, "$options": "i"} # busqueda no-exacta
admins_cursor = self.admins_collection.find(query).skip(skip).limit(limit)
admins_cursor = (

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#L101

Added line #L101 was not covered by tests
self.admins_collection.find(query).skip(page - 1).limit(self.limit)
)
admins = []
for admin in admins_cursor:
admin["_id"] = str(admin["_id"]) # <- conversión
Expand Down
8 changes: 6 additions & 2 deletions src/app/service/rule_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@
class RuleService:
def __init__(self):
self.notifications_service = Notifications()
self.limit = 10

def get_rules(self, skip: int = 0, limit: int = 10, date_order: str = "desc"):
def get_rules(self, page: int = 0, date_order: str = "desc"):
sort_order = -1 if date_order == "desc" else 1
rules = rules_entity(
db.rule.find().sort("effectiveDate", sort_order).skip(skip).limit(limit)
db.rule.find()
.sort("effectiveDate", sort_order)
.skip(page - 1)
.limit(self.limit)
)
logger.info(f"[SUCCESSFUL] GET: get_rules.\n\tFetched {len(rules)} rules.")
total = db.rule.count_documents({})
Expand Down