hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

CST-12105 refactor

Browse Source
This commit is contained in:
frabacche
2023-11-20 11:56:27 +01:00
parent 081d3ec23f
commit bfecb21337
6 changed files with 39 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dspace-api/src/main/java/org/dspace/app/ldn/model/ItemRequests.java → dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatus.java
View File

@@ -27,41 +27,14 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
*
* @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
*/
public class ItemRequests extends Base {
public class NotifyRequestStatus extends Base {
private ItemRequest endorsements;
private ItemRequest ingests;
private ItemRequest reviews;
private UUID itemUuid;
public ItemRequests() {
public NotifyRequestStatus() {
super();
}
public ItemRequest getEndorsements() {
return endorsements;
}
public void setEndorsements(ItemRequest endorsements) {
this.endorsements = endorsements;
}
public ItemRequest getIngests() {
return ingests;
}
public void setIngests(ItemRequest ingests) {
this.ingests = ingests;
}
public ItemRequest getReviews() {
return reviews;
}
public void setReviews(ItemRequest reviews) {
this.reviews = reviews;
}
public UUID getItemUuid() {
return itemUuid;
}
@@ -70,12 +43,6 @@ public class ItemRequests extends Base {
this.itemUuid = itemUuid;
}
public class ItemRequest {
Integer count;
Boolean accepted;
Boolean rejected;
Boolean tentative;
}
}

4
dspace-api/src/main/java/org/dspace/app/ldn/service/LDNMessageService.java
View File

@@ -13,8 +13,8 @@ import java.util.UUID;
import org.dspace.app.ldn.LDNMessageEntity;
import org.dspace.app.ldn.NotifyServiceEntity;
import org.dspace.app.ldn.model.ItemRequests;
import org.dspace.app.ldn.model.Notification;
import org.dspace.app.ldn.model.NotifyRequestStatus;
import org.dspace.app.ldn.model.Service;
import org.dspace.core.Context;
@@ -117,5 +117,5 @@ public interface LDNMessageService {
* @return the item requests object
* @throws SQLException If something goes wrong in the database
*/
public ItemRequests findRequestsByItemUUID(Context context, UUID itemId) throws SQLException;
public NotifyRequestStatus findRequestsByItemUUID(Context context, UUID itemId) throws SQLException;
}

9
dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
View File

@@ -26,9 +26,8 @@ import org.dspace.app.ldn.LDNRouter;
import org.dspace.app.ldn.NotifyServiceEntity;
import org.dspace.app.ldn.dao.LDNMessageDao;
import org.dspace.app.ldn.dao.NotifyServiceDao;
import org.dspace.app.ldn.model.ItemRequests;
import org.dspace.app.ldn.model.ItemRequests.ItemRequest;
import org.dspace.app.ldn.model.Notification;
import org.dspace.app.ldn.model.NotifyRequestStatus;
import org.dspace.app.ldn.model.Service;
import org.dspace.app.ldn.processor.LDNProcessor;
import org.dspace.app.ldn.service.LDNMessageService;
@@ -272,11 +271,9 @@ public class LDNMessageServiceImpl implements LDNMessageService {
}
@Override
public ItemRequests findRequestsByItemUUID(Context context, UUID itemId) throws SQLException {
ItemRequests result = new ItemRequests();
public NotifyRequestStatus findRequestsByItemUUID(Context context, UUID itemId) throws SQLException {
NotifyRequestStatus result = new NotifyRequestStatus();
result.setItemUuid(itemId);
ItemRequest ingests = result.getIngests();
result.setIngests(ingests);
/* TODO SEARCH FOR LDN MESSAGES */
return result;
}