868d6abb7 2025 -> 2026
63081666f Source file headers: 2024-> 2025.
a33f8f203 Migration stuff in progress... (all tests of all packages: OK).
d67bce18b Migration stuff in progress...
1b50060c3 BaseDao: renamed: get -> find, save -> insert, getList -> select, load -> select
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
index 13327cade..8a3f2c1be 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
63081666f
Source file headers: 2024-> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
index 4f2f3b3cf..13327cade 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
a33f8f203
Migration stuff in progress... (all tests of all packages: OK).a33f8f203ba809d731307e4785e8ad761ab4bfc0
diff --git a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
index a335504c9..4f2f3b3cf 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
@@ -40,7 +40,7 @@ import java.util.Objects;
public class BookDao extends BaseDao<BookDO> {
private static final String[] ADDITIONAL_SEARCH_FIELDS = new String[]{"lendOutBy.username", "lendOutBy.firstname",
- "lendOutBy.lastname"};
+ "lendOutBy.lastname", "signature_exact"};
@Autowired
private UserDao userDao; d67bce18b
Migration stuff in progress...d67bce18b948b5dce6a302daf4cfbfe89f4b9d99
diff --git a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
index 5f9a2ab21..a335504c9 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
@@ -24,7 +24,6 @@
package org.projectforge.business.book;
import kotlin.Pair;
-import org.apache.commons.lang3.Validate;
import org.projectforge.business.user.UserDao;
import org.projectforge.framework.access.OperationType;
import org.projectforge.framework.persistence.api.BaseDao;
@@ -32,86 +31,88 @@ import org.projectforge.framework.persistence.user.entities.PFUserDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Objects;
+
/**
* @author Kai Reinhard (k.reinhard@micromata.de)
*/
@Service
public class BookDao extends BaseDao<BookDO> {
- private static final String[] ADDITIONAL_SEARCH_FIELDS = new String[]{"lendOutBy.username", "lendOutBy.firstname",
- "lendOutBy.lastname"};
-
- @Autowired
- private UserDao userDao;
+ private static final String[] ADDITIONAL_SEARCH_FIELDS = new String[]{"lendOutBy.username", "lendOutBy.firstname",
+ "lendOutBy.lastname"};
- public BookDao() {
- super(BookDO.class);
- }
+ @Autowired
+ private UserDao userDao;
- @Override
- public String[] getAdditionalSearchFields() {
- return ADDITIONAL_SEARCH_FIELDS;
- }
+ public BookDao() {
+ super(BookDO.class);
+ }
- /**
- * Does the book's signature already exists? If signature is null, then return always false.
- *
- * @param book
- * @return
- */
- public boolean doesSignatureAlreadyExist(final BookDO book) {
- Validate.notNull(book);
- return doesSignatureAlreadyExist(book.getSignature(), book.getId());
- }
+ @Override
+ public String[] getAdditionalSearchFields() {
+ return ADDITIONAL_SEARCH_FIELDS; 1b50060c3
BaseDao: renamed: get -> find, save -> insert, getList -> select, load -> select1b50060c3a4b099ec07fd85d28f514b101da4d29
diff --git a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
index ec7a0d314..5f9a2ab21 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/book/BookDao.java
@@ -88,7 +88,7 @@ public class BookDao extends BaseDao<BookDO> {
}
public void setLendOutBy(final BookDO book, final Long lendOutById) {
- final PFUserDO user = userDao.getOrLoad(lendOutById);
+ final PFUserDO user = userDao.findOrLoad(lendOutById);
book.setLendOutBy(user);
}