From 4fbc5eb2a52681d522890d7acece78fde5afb583 Mon Sep 17 00:00:00 2001
From: Angel Montenegro <a.montenegro@orcid.org>
Date: Thu, 4 Apr 2024 15:25:29 -0600
Subject: [PATCH] Improve validated activities count (#7020)

* Deactivated records should get 409 on GET requests

* When looking into a group, if any element inside the group is validated count the group as validated

* Working on unit tests

* Working on unit tests

* Working on unit tests

* Still working on moving functionality to the orcid-core package

* Still working on moving functionality to the orcid-core package

* Still working on moving functionality to the orcid-core package

* Still working on unit tests

* Happy path unit tests done

* Fixing unit tests

* Adding more unit tests

* ImproveValidatedActivitiesCount

* New endpoint in mapi

* Very basic XML
---
 .../org/orcid/pojo/summary/AffiliationSummary.java | 14 +++++++-------
 .../java/org/orcid/pojo/summary/RecordSummary.java |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java b/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java
index 03ee2c4eae6..6a7bad05497 100644
--- a/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java
+++ b/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java
@@ -6,13 +6,13 @@
 import org.orcid.pojo.ajaxForm.PojoUtil;
 
 public class AffiliationSummary {
-    public String organizationName;
-    public String url;
-    public String startDate;
-    public String endDate;
-    public String role;
-    public String type;
-    public boolean validated;
+    private String organizationName;
+    private String url;
+    private String startDate;
+    private String endDate;
+    private String role;
+    private String type;
+    private boolean validated;
 
     public String getOrganizationName() {
         return organizationName;
diff --git a/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java b/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java
index 6f9a20ec1d6..1c3cfed92fd 100644
--- a/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java
+++ b/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java
@@ -3,9 +3,12 @@
 
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@XmlRootElement
 public class RecordSummary {
     @JsonInclude(Include.NON_NULL)
     private String name;