From 9ffa77a735b1beda237af91254ca8ed4fbd319a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Ko=C5=A1arko?= <kosarko@ufal.mff.cuni.cz>
Date: Thu, 14 Nov 2024 17:34:47 +0100
Subject: [PATCH] Expose resourceId (#1134)

A BE part of #1127 - this exposes the resourceId so it can be used in the handle mgmt table
---
 .../dspace/app/rest/converter/HandleConverter.java  |  7 +++++++
 .../java/org/dspace/app/rest/model/HandleRest.java  | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HandleConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HandleConverter.java
index dbc40a21cb60..ceb6409429a1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HandleConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HandleConverter.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.rest.converter;
 
+import java.util.Objects;
+
 import org.dspace.app.rest.model.HandleRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.handle.Handle;
@@ -35,6 +37,11 @@ public HandleRest convert(Handle modelObject, Projection projection) {
         handleRest.setHandle(modelObject.getHandle());
         handleRest.setResourceTypeID(modelObject.getResourceTypeId());
         handleRest.setUrl(modelObject.getUrl());
+        if (Objects.nonNull(modelObject.getDSpaceObject())) {
+            handleRest.setResourceId(modelObject.getDSpaceObject().getID());
+        } else {
+            handleRest.setResourceId(null);
+        }
         return handleRest;
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HandleRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HandleRest.java
index 6bb989eff09d..c40c9faa7017 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HandleRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HandleRest.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.rest.model;
 
+import java.util.UUID;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.dspace.app.rest.RestResourceController;
@@ -29,6 +31,8 @@ public class HandleRest extends BaseObjectRest<Integer> {
 
     private String url;
 
+    private UUID resourceId;
+
     public String getHandle() {
         return handle;
     }
@@ -41,6 +45,10 @@ public String getUrl() {
         return url;
     }
 
+    public UUID getResourceId() {
+        return resourceId;
+    }
+
     public void setHandle(String handle) {
         this.handle = handle;
     }
@@ -53,6 +61,11 @@ public void setUrl(String url) {
         this.url = url;
     }
 
+    public void setResourceId(UUID resourceId) {
+        this.resourceId = resourceId;
+
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;