From d7b11c4930036a59b6cc244693af37847162fed4 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 18 Dec 2024 20:36:33 +0200 Subject: [PATCH] remove custom date created in profile email domain entity (#7161) Co-authored-by: Angel Montenegro --- .../common/manager/SummaryManagerTest.java | 34 ++++++++++--------- .../v3/ProfileEmailDomainManagerTest.java | 2 -- .../entities/ProfileEmailDomainEntity.java | 11 ------ 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/orcid-core/src/test/java/org/orcid/core/common/manager/SummaryManagerTest.java b/orcid-core/src/test/java/org/orcid/core/common/manager/SummaryManagerTest.java index d3af82f2cd..67b18ed029 100644 --- a/orcid-core/src/test/java/org/orcid/core/common/manager/SummaryManagerTest.java +++ b/orcid-core/src/test/java/org/orcid/core/common/manager/SummaryManagerTest.java @@ -109,6 +109,12 @@ public class SummaryManagerTest { @Mock private ProfileEntity profileEntityMock; + + @Mock + private ProfileEmailDomainEntity profileEmailDomainEntityMock; + + @Mock + private ProfileEmailDomainEntity profileEmailDomainEntityTwoMock; @Mock private WorksCacheManager worksCacheManagerMock; @@ -561,7 +567,7 @@ public void getSummaryTest() { assertEquals(Integer.valueOf(16), rs.getPeerReviews().getTotal()); // Email domains - assertEquals("2024-12-20", rs.getEmailDomains().getEmailDomains().get(0).getVerificationDate().toString()); + assertEquals("2024-10-20", rs.getEmailDomains().getEmailDomains().get(0).getVerificationDate().toString()); assertNull(rs.getEmailDomains().getEmailDomains().get(1).getVerificationDate()); assertEquals(2, rs.getEmailDomains().getEmailDomains().size()); } @@ -597,7 +603,7 @@ public void getSummaryPojoTest() { assertEquals(16, rs.getPeerReviewsTotal()); // Email domain assertEquals(2, rs.getEmailDomains().size()); - assertEquals("2024-12-20", rs.getEmailDomains().get(0).getVerificationDate()); + assertEquals("2024-10-20", rs.getEmailDomains().get(0).getVerificationDate()); assertEquals(null, rs.getEmailDomains().get(1).getVerificationDate()); } @@ -619,20 +625,16 @@ private ResearchResources getResearchResources() { } private List getEmailDomains() { - List emailDomains = new ArrayList(); - ProfileEmailDomainEntity emailDomain = new ProfileEmailDomainEntity(); - emailDomain.setEmailDomain(EMAIL_DOMAIN); - emailDomain.setOrcid(ORCID); - emailDomain.setDateCreated(new Date(124, 11, 20)); - emailDomain.setGeneratedByScript(false); - emailDomains.add(emailDomain); - - ProfileEmailDomainEntity emailDomain2 = new ProfileEmailDomainEntity(); - emailDomain2.setEmailDomain(EMAIL_DOMAIN + "2"); - emailDomain2.setOrcid(ORCID); - emailDomain2.setDateCreated(new Date(124, 9, 20)); - emailDomain2.setGeneratedByScript(true); - emailDomains.add(emailDomain2); + List emailDomains = new ArrayList<>(); + Mockito.when(profileEmailDomainEntityMock.getEmailDomain()).thenReturn(EMAIL_DOMAIN); + Mockito.when(profileEmailDomainEntityMock.getGeneratedByScript()).thenReturn(false); + Mockito.when(profileEmailDomainEntityMock.getDateCreated()).thenReturn(new Date(124, 9, 20)); + Mockito.when(profileEmailDomainEntityTwoMock.getEmailDomain()).thenReturn(EMAIL_DOMAIN + "2"); + Mockito.when(profileEmailDomainEntityTwoMock.getGeneratedByScript()).thenReturn(true); + Mockito.when(profileEmailDomainEntityTwoMock.getDateCreated()).thenReturn(new Date(124, 11, 20)); + + emailDomains.add(profileEmailDomainEntityMock); + emailDomains.add(profileEmailDomainEntityTwoMock); return emailDomains; } diff --git a/orcid-core/src/test/java/org/orcid/core/manager/v3/ProfileEmailDomainManagerTest.java b/orcid-core/src/test/java/org/orcid/core/manager/v3/ProfileEmailDomainManagerTest.java index 1762d6c077..2dff2ccc6c 100644 --- a/orcid-core/src/test/java/org/orcid/core/manager/v3/ProfileEmailDomainManagerTest.java +++ b/orcid-core/src/test/java/org/orcid/core/manager/v3/ProfileEmailDomainManagerTest.java @@ -63,7 +63,6 @@ public void before() { ped1.setEmailDomain(EMAIL_DOMAIN); ped1.setOrcid(ORCID); - ped1.setDateCreated(new Date(124, 12, 12)); ped1.setVisibility(Visibility.PUBLIC.value()); ped2.setEmailDomain(EMAIL_DOMAIN_TWO); @@ -72,7 +71,6 @@ public void before() { ped3.setEmailDomain(EMAIL_DOMAIN); ped3.setOrcid(ORCID_TWO); - ped3.setDateCreated(new Date(124, 12, 30)); ped3.setVisibility(Visibility.PUBLIC.value()); when(profileEmailDomainDaoMock.findByEmailDomain(eq(ORCID), eq(EMAIL_DOMAIN))).thenReturn(ped1); diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ProfileEmailDomainEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ProfileEmailDomainEntity.java index 7e0584d136..56123e104b 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ProfileEmailDomainEntity.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ProfileEmailDomainEntity.java @@ -1,7 +1,6 @@ package org.orcid.persistence.jpa.entities; import javax.persistence.*; -import java.util.Date; import java.util.Objects; /** @@ -17,7 +16,6 @@ public class ProfileEmailDomainEntity extends BaseEntity { private String orcid; private String emailDomain; private String visibility; - private Date dateCreated; private Boolean generatedByScript; @Id @@ -59,15 +57,6 @@ public void setVisibility(String visibility) { this.visibility = visibility; } - @Column(name = "date_created") - public Date getDateCreated() { - return dateCreated; - } - - public void setDateCreated(Date dateCreated) { - this.dateCreated = dateCreated; - } - @Column(name = "generated_by_script") public Boolean getGeneratedByScript() { return generatedByScript;