Merge pull request #6736 from ORCID/fix/8494-qa-put-requests-that-change-publication-year-month-or-day-not-working

fix: Add missing language code and citation type comparison

Author: amontenegro

orcid-core/src/main/java/org/orcid/pojo/ajaxForm/WorkForm.java

@@ -1259,24 +1259,30 @@ public boolean compare(Object obj) {
                 if (citation == null && other.citation.getCitation() != null && StringUtils.isNotBlank(other.citation.getCitation().getValue())) {
                     return false;
                 }
-            } else if (citation.getCitation() != null && other.citation.getCitation() != null && !compareTexts(citation.getCitation(), other.citation.getCitation(), false))
+            } else if (
+                    citation.getCitation() != null && other.citation.getCitation() != null && !compareTexts(citation.getCitation(), other.citation.getCitation(), false) ||
+                    citation.getCitationType() != null && other.citation.getCitationType() != null && !compareTexts(citation.getCitationType(), other.citation.getCitationType(), false)
+            )
                 return false;
         }
         if (!isEachObjectNull(translatedTitle, other.translatedTitle)) {
             if (isAnyObjectNotNull(translatedTitle, other.translatedTitle)) {
                 if (translatedTitle == null && StringUtils.isNotBlank(other.translatedTitle.getContent())) {
                     return false;
                 }
-            } else if (other.translatedTitle.getContent() != null && !translatedTitle.getContent().equals(other.translatedTitle.getContent()))
+            } else if (
+                    other.translatedTitle.getContent() != null && !translatedTitle.getContent().equals(other.translatedTitle.getContent()) ||
+                    other.translatedTitle.getLanguageCode() != null && !translatedTitle.getLanguageCode().equals(other.translatedTitle.getLanguageCode())
+            )
                 return false;
         }
         if (!isEachObjectNull(publicationDate, other.publicationDate)) {
             if (isAnyObjectNotNull(publicationDate, other.publicationDate)) {
                 if (publicationDate == null && StringUtils.isNotBlank(other.publicationDate.getYear()))
                     return false;
             } else if (
-                    !compareStrings(publicationDate.getYear(), other.publicationDate.getYear()) &&
-                    !compareStrings(publicationDate.getMonth(), other.publicationDate.getMonth()) &&
+                    !compareStrings(publicationDate.getYear(), other.publicationDate.getYear()) ||
+                    !compareStrings(publicationDate.getMonth(), other.publicationDate.getMonth()) ||
                     !compareStrings(publicationDate.getDay(), other.publicationDate.getDay())
             )
                 return false;

orcid-core/src/test/java/org/orcid/core/manager/v3/WorkManagerTest.java

@@ -1816,7 +1816,13 @@ public void testCompareWorksPublicationDate() {
         Work workToUpdate = new Work();
         fillWork(workToUpdate);
         workToUpdate.setPutCode(work.getPutCode());
-        workToUpdate.setPublicationDate(new PublicationDate(new FuzzyDate(new Year(2023), new Month(3), new Day(3))));
+        workToUpdate.setPublicationDate(new PublicationDate(new FuzzyDate(new Year(2017), new Month(1), new Day(2))));
+        WorkTitle title = new WorkTitle();
+        title.setTitle(new Title("title"));
+        title.setSubtitle(new Subtitle("subtitle"));
+        title.setTranslatedTitle(new TranslatedTitle("titulo traducido", "es"));
+        workToUpdate.setWorkTitle(title);
+        workToUpdate.setWorkCitation(new Citation("citation", CitationType.FORMATTED_IEEE));
         WorkForm workFormToUpdate = WorkForm.valueOf(workToUpdate, 50);
 
         assertFalse(workSaved.compare(workFormToUpdate));