refactor: remove registration time from contributor

elimu-ai/wiki#194

Author: jo-elimu

pom-dependency-tree.txt

@@ -1,4 +1,4 @@
-ai.elimu:webapp:war:2.6.115-SNAPSHOT
+ai.elimu:webapp:war:2.6.116-SNAPSHOT
 +- ai.elimu:model:jar:model-2.0.119:compile
 |  \- com.google.code.gson:gson:jar:2.13.1:compile
 |     \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile

src/main/java/ai/elimu/dao/ContributorDao.java

@@ -1,6 +1,5 @@
 package ai.elimu.dao;
 
-import java.util.Calendar;
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;
@@ -19,8 +18,6 @@ public interface ContributorDao extends GenericDao<Contributor> {
 
     List<Contributor> readAllOrderedDesc() throws DataAccessException;
 
-    List<Contributor> readAll(Calendar calendarFrom, Calendar calendarTo) throws DataAccessException;
-    
     List<Contributor> readAllWithStoryBookContributions() throws DataAccessException;
 
     List<Contributor> readAllWithWordContributions() throws DataAccessException;

src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java

@@ -71,20 +71,7 @@ public List<Contributor> readAllOrderedDesc() throws DataAccessException {
         return em.createQuery(
             "SELECT c " +
             "FROM Contributor c " +
-            "ORDER BY c.registrationTime DESC")
-            .getResultList();
-    }
-
-    @Override
-    public List<Contributor> readAll(Calendar calendarFrom, Calendar calendarTo) throws DataAccessException {
-        return em.createQuery(
-            "SELECT c " +
-            "FROM Contributor c " +
-            "WHERE c.registrationTime >= :calendarFrom " +
-            "AND c.registrationTime < :calendarTo " +
-            "ORDER BY c.registrationTime DESC")
-            .setParameter("calendarFrom", calendarFrom)
-            .setParameter("calendarTo", calendarTo)
+            "ORDER BY c.id DESC")
             .getResultList();
     }
 

src/main/java/ai/elimu/entity/contributor/Contributor.java

@@ -6,11 +6,8 @@
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import java.util.Calendar;
 import java.util.Set;
 
 import ai.elimu.entity.BaseEntity;
@@ -32,14 +29,6 @@ public class Contributor extends BaseEntity {
   @Enumerated(EnumType.STRING)
   private Set<Role> roles;
 
-  @NotNull
-  @Temporal(TemporalType.TIMESTAMP)
-  private Calendar registrationTime;
-
-  // TODO: add registrationPlatform
-
-  // TODO: add registrationProvider
-
   /**
    * An Ethereum address. Expected format: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B"
    */

src/main/java/ai/elimu/web/SignOnControllerDiscord.java

@@ -144,7 +144,6 @@ public String handleCallback(HttpServletRequest request) throws IOException, Int
       log.info("existingContributor: " + existingContributor);
       if (existingContributor == null) {
         // Store new Contributor in database
-        contributor.setRegistrationTime(Calendar.getInstance());
         contributor.setRoles(new HashSet<>(Arrays.asList(Role.CONTRIBUTOR)));
         if (contributor.getEmail() == null) {
           // Ask the Contributor to add their e-mail manually

src/main/java/ai/elimu/web/SignOnControllerGitHub.java

@@ -152,7 +152,6 @@ public String handleCallback(HttpServletRequest request, Model model) {
       log.info("existingContributor: " + existingContributor);
       if (existingContributor == null) {
         // Store new Contributor in database
-        contributor.setRegistrationTime(Calendar.getInstance());
         contributor.setRoles(new HashSet<>(Arrays.asList(Role.CONTRIBUTOR)));
         if (contributor.getEmail() == null) {
           // Ask the Contributor to add her e-mail manually

src/main/java/ai/elimu/web/SignOnControllerSelenium.java

@@ -42,7 +42,6 @@ public String handleRequest(
     Contributor contributor = new Contributor();
     contributor.setEmail("info+role-" + role + "@elimu.ai");
     contributor.setRoles(new HashSet<>(Arrays.asList(role)));
-    contributor.setRegistrationTime(Calendar.getInstance());
     contributor.setFirstName("TestRole");
     contributor.setLastName(role.toString());
     contributor.setMotivation("Regression testing as " + role);

src/main/java/ai/elimu/web/SignOnControllerWeb3.java

@@ -93,7 +93,6 @@ public String handleAuthorization(
     if (existingContributor == null) {
       // Store new Contributor in database
       contributor.setEmail(address + "@ethmail.cc");
-      contributor.setRegistrationTime(Calendar.getInstance());
       contributor.setRoles(new HashSet<>(Arrays.asList(Role.CONTRIBUTOR)));
       contributorDao.create(contributor);
       log.debug("Contributor " + contributor.getEmail() + " was created at " + request.getServerName());

src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java

@@ -167,7 +167,6 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
 
         Contributor contributor = new Contributor();
         contributor.setEmail("dev@elimu.ai");
-        contributor.setRegistrationTime(Calendar.getInstance());
         contributor.setRoles(new HashSet<>(Arrays.asList(Role.CONTRIBUTOR)));
         contributorDao.create(contributor);
 

src/main/resources/META-INF/jpa-schema-export.sql

@@ -485,7 +485,6 @@
         providerIdDiscord varchar(255),
         providerIdGitHub varchar(255),
         providerIdWeb3 varchar(42),
-        registrationTime datetime,
         usernameDiscord varchar(255),
         usernameGitHub varchar(255),
         primary key (id)