diff --git a/server/api/routes/project/items.py b/server/api/routes/project/items.py index e548ffb24e7cb664cbce2853a9033c7631b7dcd5..397553297a9f4cbe85b1c42bba2b6448cd9c3ae9 100644 --- a/server/api/routes/project/items.py +++ b/server/api/routes/project/items.py @@ -1,5 +1,7 @@ from fastapi import APIRouter, Depends, HTTPException, status, Query -from nacsos_data.db.schemas import Project, ItemTypeLiteral, GenericItem, AcademicItem, ItemType, Item, LexisNexisItem +from nacsos_data.db.crud.items.lexis_nexis import read_lexis_paged_for_project +from nacsos_data.db.schemas import Project, ItemTypeLiteral, GenericItem, AcademicItem, ItemType, Item, LexisNexisItem, \ + LexisNexisItemSource from nacsos_data.models.items import AnyItemModel, GenericItemModel, AcademicItemModel, AnyItemModelList, \ LexisNexisItemModel @@ -14,7 +16,7 @@ from nacsos_data.db.crud.items.twitter import \ read_all_twitter_items_for_project_paged, \ read_twitter_item_by_item_id, \ import_tweet -from sqlalchemy import select +from sqlalchemy import select, func from server.api.errors import ItemNotFoundError from server.data import db_engine @@ -59,9 +61,8 @@ async def list_project_data_paged(item_type: ItemTypeLiteral, page: int, page_si page=page, page_size=page_size, project_id=project_id, engine=db_engine) if item_type == 'lexis': - return await read_paged_for_project(Model=LexisNexisItemModel, Schema=LexisNexisItem, - page=page, page_size=page_size, - project_id=project_id, engine=db_engine) + return await read_lexis_paged_for_project(page=page, page_size=page_size, + project_id=project_id, db_engine=db_engine) if item_type == 'twitter': return await read_all_twitter_items_for_project_paged(project_id=project_id, page=page, page_size=page_size, engine=db_engine)