refactor(crowdsource): delete platform from peer review events (#1710)

elimu-ai · Jul 11, 2024 · eda9285 · eda9285
2 parents 6a2611f + e6b6c1b
commit eda9285
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 34 deletions.
diff --git a/src/main/java/ai/elimu/model/contributor/PeerReviewEvent.java b/src/main/java/ai/elimu/model/contributor/PeerReviewEvent.java
@@ -1,12 +1,8 @@
 package ai.elimu.model.contributor;
 
 import ai.elimu.model.BaseEntity;
-import ai.elimu.model.enums.Platform;
 import java.util.Calendar;
 import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Temporal;
@@ -39,13 +35,6 @@ public class PeerReviewEvent extends BaseEntity {
     @NotNull
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar time;
-
-    /**
-     * The platform that the {@link Contributor} used when performing the peer-review.
-     */
-    @NotNull
-    @Enumerated(EnumType.STRING)
-    private Platform platform;
 
     public Contributor getContributor() {
         return contributor;
@@ -78,12 +67,4 @@ public Calendar getTime() {
     public void setTime(Calendar time) {
         this.time = time;
     }
-
-    public Platform getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(Platform platform) {
-        this.platform = platform;
-    }
 }
diff --git a/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
@@ -9,7 +9,6 @@
 import ai.elimu.model.contributor.AudioContributionEvent;
 import ai.elimu.model.contributor.AudioPeerReviewEvent;
 import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
@@ -62,7 +61,6 @@ public String handleSubmit(
         audioPeerReviewEvent.setApproved(approved);
         audioPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         audioPeerReviewEvent.setTime(Calendar.getInstance());
-        audioPeerReviewEvent.setPlatform(Platform.WEBAPP);
         audioPeerReviewEventDao.create(audioPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {

diff --git a/...ain/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java b/...ain/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
@@ -10,7 +10,6 @@
 import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
 import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
 import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
@@ -61,7 +60,6 @@ public String handleSubmit(
         letterSoundPeerReviewEvent.setApproved(approved);
         letterSoundPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         letterSoundPeerReviewEvent.setTime(Calendar.getInstance());
-        letterSoundPeerReviewEvent.setPlatform(Platform.WEBAPP);
         letterSoundPeerReviewEventDao.create(letterSoundPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {

diff --git a/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
@@ -9,7 +9,6 @@
 import ai.elimu.model.contributor.NumberContributionEvent;
 import ai.elimu.model.contributor.NumberPeerReviewEvent;
 import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
@@ -59,7 +58,6 @@ public String handleSubmit(
         numberPeerReviewEvent.setApproved(approved);
         numberPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         numberPeerReviewEvent.setTime(Calendar.getInstance());
-        numberPeerReviewEvent.setPlatform(Platform.WEBAPP);
         numberPeerReviewEventDao.create(numberPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {

diff --git a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
@@ -9,7 +9,6 @@
 import ai.elimu.model.contributor.StoryBookContributionEvent;
 import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
 import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
@@ -59,7 +58,6 @@ public String handleSubmit(
         storyBookPeerReviewEvent.setApproved(approved);
         storyBookPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         storyBookPeerReviewEvent.setTime(Calendar.getInstance());
-        storyBookPeerReviewEvent.setPlatform(Platform.WEBAPP);
         storyBookPeerReviewEventDao.create(storyBookPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {

diff --git a/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
@@ -9,7 +9,6 @@
 import ai.elimu.model.contributor.WordContributionEvent;
 import ai.elimu.model.contributor.WordPeerReviewEvent;
 import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
@@ -59,7 +58,6 @@ public String handleSubmit(
         wordPeerReviewEvent.setApproved(approved);
         wordPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         wordPeerReviewEvent.setTime(Calendar.getInstance());
-        wordPeerReviewEvent.setPlatform(Platform.WEBAPP);
         wordPeerReviewEventDao.create(wordPeerReviewEvent);
 
         if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {

diff --git a/src/main/resources/META-INF/jpa-schema-export.sql b/src/main/resources/META-INF/jpa-schema-export.sql
@@ -216,7 +216,6 @@
        id bigint not null auto_increment,
         approved bit,
         comment varchar(1000),
-        platform varchar(255),
         time datetime,
         contributor_id bigint,
         audioContributionEvent_id bigint,
@@ -415,7 +414,6 @@
        id bigint not null auto_increment,
         approved bit,
         comment varchar(1000),
-        platform varchar(255),
         time datetime,
         contributor_id bigint,
         letterSoundCorrespondenceContributionEvent_id bigint,
@@ -456,7 +454,6 @@
        id bigint not null auto_increment,
         approved bit,
         comment varchar(1000),
-        platform varchar(255),
         time datetime,
         contributor_id bigint,
         numberContributionEvent_id bigint,
@@ -565,7 +562,6 @@
        id bigint not null auto_increment,
         approved bit,
         comment varchar(1000),
-        platform varchar(255),
         time datetime,
         contributor_id bigint,
         storyBookContributionEvent_id bigint,
@@ -683,7 +679,6 @@
        id bigint not null auto_increment,
         approved bit,
         comment varchar(1000),
-        platform varchar(255),
         time datetime,
         contributor_id bigint,
         wordContributionEvent_id bigint,

diff --git a/src/main/resources/db/migration/2004005.sql b/src/main/resources/db/migration/2004005.sql
@@ -0,0 +1,7 @@
+# 2.4.5
+
+ALTER TABLE `AudioPeerReviewEvent` DROP COLUMN `platform`;
+ALTER TABLE `LetterSoundCorrespondencePeerReviewEvent` DROP COLUMN `platform`;
+ALTER TABLE `NumberPeerReviewEvent` DROP COLUMN `platform`;
+ALTER TABLE `StoryBookPeerReviewEvent` DROP COLUMN `platform`;
+ALTER TABLE `WordPeerReviewEvent` DROP COLUMN `platform`;