lacerta-dev/Lacerta
1
0
Fork 0
mirror of https://github.com/lacerta-doc/Lacerta.git synced 2024-11-22 16:03:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ドキュメントを正常に取得できるようになった

Browse Source
This commit is contained in:
r-ca 2024-01-22 23:29:49 +09:00
parent c7f2a3eebe
commit de30eb241c
No known key found for this signature in database
GPG Key ID: 6A72911AC73464A9
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryImpl.java
View File

@ -71,16 +71,29 @@ public class LacertaLibraryImpl implements LacertaLibrary {
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
LibraryItemPage libraryItemPage = new LibraryItemPage(); LibraryItemPage libraryItemPage = new LibraryItemPage();
FolderEntity folderEntity = database.folderDao().findById(pageId); List<FolderEntity> folderEntities;
if (folderEntity == null) { List<DocumentEntity> documentEntities;
logger.warn("LacertaLibraryImpl", pageId + " is not found.");
return null;
}
List<FolderEntity> folderEntities = database.folderDao().findByParentId(pageId); if (pageId == null) { // When root folder
logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size()); libraryItemPage.setPageTitle("ライブラリ");
List<DocumentEntity> documentEntities = database.documentDao().findByParentId(pageId); libraryItemPage.setPageId(null);
logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size()); libraryItemPage.setParentId(null);
folderEntities = database.folderDao().findRootFolders();
documentEntities = database.documentDao().findRootDocuments();
} else {
FolderEntity folderEntity = database.folderDao().findById(pageId);
if (folderEntity == null) {
logger.warn("LacertaLibraryImpl", pageId + " is not found.");
return null;
}
libraryItemPage.setPageTitle(folderEntity.name);
libraryItemPage.setPageId(folderEntity.id);
libraryItemPage.setParentId(folderEntity.parentId);
folderEntities = database.folderDao().findByParentId(pageId);
documentEntities = database.documentDao().findByParentId(pageId);
}
ArrayList<ListItem> listItems = new ArrayList<>(); ArrayList<ListItem> listItems = new ArrayList<>();
for (FolderEntity childFolderEntity : folderEntities) { for (FolderEntity childFolderEntity : folderEntities) {
@ -103,9 +116,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
listItems.add(listItem); listItems.add(listItem);
} }
libraryItemPage.setPageTitle(folderEntity.name);
libraryItemPage.setPageId(folderEntity.id);
libraryItemPage.setParentId(folderEntity.parentId);
libraryItemPage.setListItems(listItems); libraryItemPage.setListItems(listItems);
logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size()); logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());