elimu-ai#1684 renamed package ai.elmu.model to ai.elmu.entity

diptechexpo · Jul 7, 2024 · 3221f77 · 3221f77
1 parent f42424d
commit 3221f77
Show file tree

Hide file tree

Showing 261 changed files with 696 additions and 1,827 deletions.
diff --git a/DB_MIGRATION.md b/DB_MIGRATION.md
@@ -1,6 +1,6 @@
 # DB Migration 🔀
 
-By using the Java Persistence API (JPA), classed annotated by `@Entity` (in the [`model`](src/main/java/ai/elimu/model) package) get mapped automatically to database tables/columns: [`src/main/resources/META-INF/jpa-persistence.xml`](https://github.com/elimu-ai/webapp/blob/main/src/main/resources/META-INF/jpa-persistence.xml)
+By using the Java Persistence API (JPA), classed annotated by `@Entity` (in the [`model`](src/main/java/ai/elimu/entity) package) get mapped automatically to database tables/columns: [`src/main/resources/META-INF/jpa-persistence.xml`](https://github.com/elimu-ai/webapp/blob/main/src/main/resources/META-INF/jpa-persistence.xml)
 
 > [!IMPORTANT]
 > However, when _deleting, modifying or renaming_ an entity class/attribute, we have to manually update the underlying database structure.

diff --git a/src/main/java/ai/elimu/dao/ApplicationDao.java b/src/main/java/ai/elimu/dao/ApplicationDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 

diff --git a/src/main/java/ai/elimu/dao/ApplicationVersionDao.java b/src/main/java/ai/elimu/dao/ApplicationVersionDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/AudioContributionEventDao.java b/src/main/java/ai/elimu/dao/AudioContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.AudioContributionEvent;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.AudioContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/AudioDao.java b/src/main/java/ai/elimu/dao/AudioDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import java.util.List;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.AudioPeerReviewEvent;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.AudioPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/ContributorDao.java b/src/main/java/ai/elimu/dao/ContributorDao.java
@@ -5,7 +5,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 
 public interface ContributorDao extends GenericDao<Contributor> {
 

diff --git a/src/main/java/ai/elimu/dao/DbMigrationDao.java b/src/main/java/ai/elimu/dao/DbMigrationDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.DbMigration;
+import ai.elimu.entity.DbMigration;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/DeviceDao.java b/src/main/java/ai/elimu/dao/DeviceDao.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.Device;
+import ai.elimu.entity.Device;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/EmojiDao.java b/src/main/java/ai/elimu/dao/EmojiDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/ImageContributionEventDao.java b/src/main/java/ai/elimu/dao/ImageContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/ImageDao.java b/src/main/java/ai/elimu/dao/ImageDao.java
@@ -1,11 +1,11 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 
 public interface ImageDao extends GenericDao<Image> {
 

diff --git a/src/main/java/ai/elimu/dao/LetterContributionEventDao.java b/src/main/java/ai/elimu/dao/LetterContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterContributionEvent;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/LetterDao.java b/src/main/java/ai/elimu/dao/LetterDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/LetterLearningEventDao.java b/src/main/java/ai/elimu/dao/LetterLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.LetterLearningEvent;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.LetterLearningEvent;
+import ai.elimu.entity.content.Letter;
 import java.util.Calendar;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java b/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/LetterSoundDao.java b/src/main/java/ai/elimu/dao/LetterSoundDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondencePeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/NumberContributionEventDao.java b/src/main/java/ai/elimu/dao/NumberContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/NumberDao.java b/src/main/java/ai/elimu/dao/NumberDao.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/SoundContributionEventDao.java b/src/main/java/ai/elimu/dao/SoundContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.SoundContributionEvent;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.SoundContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/SoundDao.java b/src/main/java/ai/elimu/dao/SoundDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/StoryBookChapterDao.java b/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java b/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/StoryBookDao.java b/src/main/java/ai/elimu/dao/StoryBookDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.content.StoryBook;
 
 import ai.elimu.model.v2.enums.ReadingLevel;
 

diff --git a/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java b/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.StoryBook;
 import java.util.Calendar;
 import java.util.List;
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java b/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/SyllableDao.java b/src/main/java/ai/elimu/dao/SyllableDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Syllable;
+import ai.elimu.entity.content.Syllable;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/VideoDao.java b/src/main/java/ai/elimu/dao/VideoDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/WordContributionEventDao.java b/src/main/java/ai/elimu/dao/WordContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/WordDao.java b/src/main/java/ai/elimu/dao/WordDao.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 import ai.elimu.model.v2.enums.content.WordType;
 import org.springframework.dao.DataAccessException;

diff --git a/src/main/java/ai/elimu/dao/WordLearningEventDao.java b/src/main/java/ai/elimu/dao/WordLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.WordLearningEvent;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.WordLearningEvent;
+import ai.elimu.entity.content.Word;
 import java.util.Calendar;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 

diff --git a/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import javax.persistence.NoResultException;
 import ai.elimu.dao.ApplicationDao;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 
 import org.springframework.dao.DataAccessException;