From 3221f7722d16ec6807947c4be41cc97f7c9fcc12 Mon Sep 17 00:00:00 2001 From: diptechexpo Date: Sun, 7 Jul 2024 15:03:47 -0500 Subject: [PATCH 1/2] #1684 renamed package ai.elmu.model to ai.elmu.entity --- DB_MIGRATION.md | 2 +- .../java/ai/elimu/dao/ApplicationDao.java | 2 +- .../ai/elimu/dao/ApplicationVersionDao.java | 4 +- .../elimu/dao/AudioContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/AudioDao.java | 6 +- .../ai/elimu/dao/AudioPeerReviewEventDao.java | 8 +- .../java/ai/elimu/dao/ContributorDao.java | 2 +- .../java/ai/elimu/dao/DbMigrationDao.java | 2 +- src/main/java/ai/elimu/dao/DeviceDao.java | 2 +- src/main/java/ai/elimu/dao/EmojiDao.java | 4 +- .../elimu/dao/ImageContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/ImageDao.java | 4 +- .../elimu/dao/LetterContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/LetterDao.java | 2 +- .../ai/elimu/dao/LetterLearningEventDao.java | 6 +- .../dao/LetterSoundContributionEventDao.java | 6 +- .../java/ai/elimu/dao/LetterSoundDao.java | 6 +- .../dao/LetterSoundPeerReviewEventDao.java | 8 +- .../elimu/dao/NumberContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/NumberDao.java | 2 +- .../elimu/dao/NumberPeerReviewEventDao.java | 8 +- .../elimu/dao/SoundContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/SoundDao.java | 2 +- .../ai/elimu/dao/StoryBookChapterDao.java | 4 +- .../dao/StoryBookContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/StoryBookDao.java | 2 +- .../elimu/dao/StoryBookLearningEventDao.java | 6 +- .../ai/elimu/dao/StoryBookParagraphDao.java | 4 +- .../dao/StoryBookPeerReviewEventDao.java | 8 +- src/main/java/ai/elimu/dao/SyllableDao.java | 2 +- src/main/java/ai/elimu/dao/VideoDao.java | 2 +- .../elimu/dao/WordContributionEventDao.java | 6 +- src/main/java/ai/elimu/dao/WordDao.java | 2 +- .../ai/elimu/dao/WordLearningEventDao.java | 6 +- .../ai/elimu/dao/WordPeerReviewEventDao.java | 8 +- .../ai/elimu/dao/jpa/ApplicationDaoJpa.java | 2 +- .../dao/jpa/ApplicationVersionDaoJpa.java | 4 +- .../dao/jpa/AudioContributionEventDaoJpa.java | 6 +- .../java/ai/elimu/dao/jpa/AudioDaoJpa.java | 6 +- .../dao/jpa/AudioPeerReviewEventDaoJpa.java | 8 +- .../ai/elimu/dao/jpa/ContributorDaoJpa.java | 2 +- .../ai/elimu/dao/jpa/DbMigrationDaoJpa.java | 2 +- .../java/ai/elimu/dao/jpa/DeviceDaoJpa.java | 2 +- .../java/ai/elimu/dao/jpa/EmojiDaoJpa.java | 4 +- .../dao/jpa/ImageContributionEventDaoJpa.java | 6 +- .../java/ai/elimu/dao/jpa/ImageDaoJpa.java | 4 +- .../jpa/LetterContributionEventDaoJpa.java | 6 +- .../java/ai/elimu/dao/jpa/LetterDaoJpa.java | 2 +- .../dao/jpa/LetterLearningEventDaoJpa.java | 6 +- .../LetterSoundContributionEventDaoJpa.java | 6 +- .../ai/elimu/dao/jpa/LetterSoundDaoJpa.java | 6 +- .../jpa/LetterSoundPeerReviewEventDaoJpa.java | 8 +- .../jpa/NumberContributionEventDaoJpa.java | 8 +- .../java/ai/elimu/dao/jpa/NumberDaoJpa.java | 2 +- .../dao/jpa/NumberPeerReviewEventDaoJpa.java | 8 +- .../dao/jpa/SoundContributionEventDaoJpa.java | 6 +- .../java/ai/elimu/dao/jpa/SoundDaoJpa.java | 2 +- .../elimu/dao/jpa/StoryBookChapterDaoJpa.java | 4 +- .../jpa/StoryBookContributionEventDaoJpa.java | 6 +- .../ai/elimu/dao/jpa/StoryBookDaoJpa.java | 2 +- .../dao/jpa/StoryBookLearningEventDaoJpa.java | 6 +- .../dao/jpa/StoryBookParagraphDaoJpa.java | 4 +- .../jpa/StoryBookPeerReviewEventDaoJpa.java | 8 +- .../java/ai/elimu/dao/jpa/SyllableDaoJpa.java | 2 +- .../java/ai/elimu/dao/jpa/VideoDaoJpa.java | 2 +- .../dao/jpa/WordContributionEventDaoJpa.java | 6 +- .../java/ai/elimu/dao/jpa/WordDaoJpa.java | 2 +- .../dao/jpa/WordLearningEventDaoJpa.java | 6 +- .../dao/jpa/WordPeerReviewEventDaoJpa.java | 8 +- .../elimu/{model => entity}/BaseEntity.java | 2 +- .../elimu/{model => entity}/DbMigration.java | 2 +- .../ai/elimu/{model => entity}/Device.java | 2 +- .../{model => entity}/admin/Application.java | 7 +- .../admin/ApplicationVersion.java | 7 +- .../analytics/LearningEvent.java | 6 +- .../analytics/LetterLearningEvent.java | 5 +- .../analytics/StoryBookLearningEvent.java | 4 +- .../analytics/WordLearningEvent.java | 5 +- .../{model => entity}/content/Content.java | 7 +- .../{model => entity}/content/Emoji.java | 2 +- .../{model => entity}/content/Letter.java | 2 +- .../content/LetterSoundCorrespondence.java | 3 +- .../{model => entity}/content/Number.java | 2 +- .../{model => entity}/content/Sound.java | 5 +- .../{model => entity}/content/StoryBook.java | 7 +- .../content/StoryBookChapter.java | 8 +- .../content/StoryBookParagraph.java | 6 +- .../{model => entity}/content/Syllable.java | 2 +- .../elimu/{model => entity}/content/Word.java | 2 +- .../content/multimedia/Audio.java | 6 +- .../content/multimedia/Image.java | 2 +- .../content/multimedia/Multimedia.java | 12 +- .../content/multimedia/Video.java | 2 +- .../contributor/AudioContributionEvent.java | 5 +- .../contributor/AudioPeerReviewEvent.java | 2 +- .../contributor/ContributionEvent.java | 7 +- .../contributor/Contributor.java | 7 +- .../contributor/ImageContributionEvent.java | 4 +- .../contributor/LetterContributionEvent.java | 5 +- ...rSoundCorrespondenceContributionEvent.java | 4 +- ...terSoundCorrespondencePeerReviewEvent.java | 2 +- .../contributor/NumberContributionEvent.java | 4 +- .../contributor/NumberPeerReviewEvent.java | 2 +- .../contributor/PeerReviewEvent.java | 7 +- .../contributor/SoundContributionEvent.java | 4 +- .../StoryBookContributionEvent.java | 6 +- .../contributor/StoryBookPeerReviewEvent.java | 2 +- .../contributor/WordContributionEvent.java | 4 +- .../contributor/WordPeerReviewEvent.java | 2 +- .../ai/elimu/entity/enums/CodeLicense.java | 5 + .../enums/ContentLicense.java | 2 +- .../enums/PeerReviewStatus.java | 2 +- .../{model => entity}/enums/Platform.java | 2 +- .../{model => entity}/enums/Provider.java | 2 +- .../elimu/{model => entity}/enums/Role.java | 2 +- .../enums/StoryBookProvider.java | 2 +- .../StringToApplicationConverter.java | 2 +- .../converters/StringToAudioConverter.java | 2 +- .../StringToContributorConverter.java | 2 +- .../converters/StringToImageConverter.java | 2 +- .../converters/StringToLetterConverter.java | 2 +- ...gToLetterSoundCorrespondenceConverter.java | 2 +- .../converters/StringToSoundConverter.java | 2 +- .../StringToStoryBookChapterConverter.java | 2 +- .../StringToStoryBookConverter.java | 2 +- .../StringToStoryBookParagraphConverter.java | 2 +- .../converters/StringToWordConverter.java | 2 +- .../ai/elimu/model/enums/CodeLicense.java | 5 - .../ai/elimu/rest/v2/JpaToGsonConverter.java | 28 +- .../LetterLearningEventsRestController.java | 6 +- ...StoryBookLearningEventsRestController.java | 6 +- .../WordLearningEventsRestController.java | 6 +- .../ApplicationsRestController.java | 4 +- .../rest/v2/content/AudiosRestController.java | 2 +- .../rest/v2/content/EmojisRestController.java | 2 +- .../rest/v2/content/ImagesRestController.java | 2 +- .../content/LetterSoundsRestController.java | 2 +- .../v2/content/LettersRestController.java | 2 +- .../v2/content/NumbersRestController.java | 2 +- .../rest/v2/content/SoundsRestController.java | 2 +- .../rest/v2/content/VideosRestController.java | 2 +- .../rest/v2/content/WordsRestController.java | 2 +- .../v2/service/StoryBooksJsonService.java | 6 +- ...oundCorrespondenceUsageCountScheduler.java | 8 +- .../tasks/LetterUsageCountScheduler.java | 8 +- .../elimu/tasks/ParagraphWordScheduler.java | 4 +- .../elimu/tasks/SoundUsageCountScheduler.java | 6 +- .../tasks/SyllableUsageCountScheduler.java | 10 +- .../elimu/tasks/WordUsageCountScheduler.java | 8 +- .../elimu/util/SyllableFrequencyHelper.java | 4 +- .../java/ai/elimu/util/SyllableHelper.java | 2 +- .../csv/CsvAnalyticsExtractionHelper.java | 6 +- .../util/csv/CsvContentExtractionHelper.java | 16 +- .../util/csv/CsvLetterExtractionHelper.java | 2 +- .../util/csv/CsvSoundExtractionHelper.java | 2 +- .../elimu/util/db/DbContentImportHelper.java | 38 +- .../ai/elimu/util/db/DbMigrationHelper.java | 2 +- .../epub/EPubChapterExtractionHelper.java | 2 +- .../util/epub/EPubImageExtractionHelper.java | 2 +- .../epub/EPubParagraphExtractionHelper.java | 2 +- .../web/CustomAuthenticationManager.java | 4 +- .../java/ai/elimu/web/SignOnController.java | 6 +- .../ai/elimu/web/SignOnControllerDiscord.java | 4 +- .../ai/elimu/web/SignOnControllerGitHub.java | 4 +- .../elimu/web/SignOnControllerSelenium.java | 4 +- .../ai/elimu/web/SignOnControllerWeb3.java | 4 +- .../ApplicationCreateController.java | 2 +- .../ApplicationEditController.java | 4 +- .../ApplicationListController.java | 2 +- .../ApplicationVersionCreateController.java | 6 +- .../LetterLearningEventListController.java | 2 +- ...yBookLearningEventCsvExportController.java | 2 +- .../StoryBookLearningEventListController.java | 2 +- .../WordLearningEventListController.java | 2 +- .../web/content/MainContentController.java | 2 +- .../contributor/AddEmailController.java | 2 +- .../contributor/ContributorController.java | 14 +- .../contributor/EditMotivationController.java | 3 +- .../contributor/EditNameController.java | 2 +- .../content/emoji/EmojiCreateController.java | 2 +- .../emoji/EmojiCsvExportController.java | 4 +- .../content/emoji/EmojiEditController.java | 4 +- .../content/emoji/EmojiListController.java | 2 +- .../letter/LetterCreateController.java | 8 +- .../letter/LetterCsvExportController.java | 4 +- .../content/letter/LetterEditController.java | 8 +- .../content/letter/LetterListController.java | 2 +- .../LetterSoundCreateController.java | 12 +- .../LetterSoundCsvExportController.java | 6 +- .../LetterSoundEditController.java | 14 +- .../LetterSoundListController.java | 2 +- .../LetterSoundPeerReviewsController.java | 6 +- .../audio/AudioCreateController.java | 16 +- .../audio/AudioCsvExportController.java | 2 +- .../multimedia/audio/AudioEditController.java | 18 +- .../multimedia/audio/AudioListController.java | 2 +- .../image/ImageCreateController.java | 12 +- .../image/ImageCsvExportController.java | 2 +- .../multimedia/image/ImageEditController.java | 20 +- .../multimedia/image/ImageListController.java | 6 +- .../video/VideoCreateController.java | 4 +- .../video/VideoCsvExportController.java | 2 +- .../multimedia/video/VideoEditController.java | 12 +- .../multimedia/video/VideoListController.java | 2 +- .../number/NumberCreateController.java | 12 +- .../number/NumberCsvExportController.java | 4 +- .../content/number/NumberEditController.java | 12 +- .../content/number/NumberListController.java | 2 +- .../number/NumberPeerReviewsController.java | 6 +- .../AudioPeerReviewEventCreateController.java | 12 +- ...rSoundPeerReviewEventCreateController.java | 14 +- ...NumberPeerReviewEventCreateController.java | 12 +- ...ryBookPeerReviewEventCreateController.java | 12 +- .../WordPeerReviewEventCreateController.java | 12 +- .../content/sound/SoundCreateController.java | 8 +- .../sound/SoundCsvExportController.java | 2 +- .../content/sound/SoundEditController.java | 8 +- .../content/sound/SoundListController.java | 2 +- .../storybook/StoryBookCreateController.java | 12 +- .../StoryBookCreateFromEPubController.java | 16 +- .../StoryBookCsvExportController.java | 6 +- .../storybook/StoryBookEditController.java | 22 +- .../StoryBookPeerReviewsController.java | 6 +- .../StoryBookChapterCreateController.java | 14 +- .../StoryBookChapterDeleteController.java | 22 +- .../StoryBookParagraphCreateController.java | 14 +- .../StoryBookParagraphDeleteController.java | 16 +- .../StoryBookParagraphEditController.java | 16 +- .../syllable/SyllableCsvExportController.java | 4 +- .../syllable/SyllableListController.java | 2 +- .../content/word/WordCreateController.java | 22 +- .../word/WordCreationsPendingController.java | 4 +- .../content/word/WordCsvExportController.java | 4 +- .../web/content/word/WordEditController.java | 24 +- .../web/content/word/WordListController.java | 4 +- .../word/WordPeerReviewsController.java | 10 +- .../MostRecentContributionsController.java | 10 +- .../ai/elimu/web/download/ApkController.java | 4 +- .../elimu/web/download/AudioController.java | 2 +- .../elimu/web/download/ImageController.java | 2 +- .../elimu/web/download/VideoController.java | 2 +- .../resources/META-INF/jpa-schema-export.sql | 1131 ----------------- .../java/ai/elimu/dao/ApplicationDaoTest.java | 2 +- .../elimu/dao/ApplicationVersionDaoTest.java | 4 +- src/test/java/ai/elimu/dao/BaseDaoTest.java | 3 +- .../java/ai/elimu/dao/ContributorDaoTest.java | 2 +- src/test/java/ai/elimu/dao/DeviceDaoTest.java | 2 +- src/test/java/ai/elimu/dao/EmojiDaoTest.java | 2 +- src/test/java/ai/elimu/dao/ImageDaoTest.java | 4 +- src/test/java/ai/elimu/dao/LetterDaoTest.java | 2 +- src/test/java/ai/elimu/dao/NumberDaoTest.java | 4 +- src/test/java/ai/elimu/dao/SoundDaoTest.java | 2 +- .../elimu/dao/StoryBookParagraphDaoTest.java | 5 +- src/test/java/ai/elimu/dao/VideoDaoTest.java | 2 +- .../dao/WordContributionEventDaoTest.java | 6 +- src/test/java/ai/elimu/dao/WordDaoTest.java | 2 +- .../ai/elimu/util/SyllableHelperTest.java | 2 +- .../csv/CsvLetterExtractionHelperTest.java | 3 +- .../csv/CsvSoundExtractionHelperTest.java | 3 +- .../word/WordCreateControllerTest.java | 2 +- src/test/java/selenium/SignOnHelper.java | 2 +- 261 files changed, 696 insertions(+), 1827 deletions(-) rename src/main/java/ai/elimu/{model => entity}/BaseEntity.java (95%) rename src/main/java/ai/elimu/{model => entity}/DbMigration.java (97%) rename src/main/java/ai/elimu/{model => entity}/Device.java (98%) rename src/main/java/ai/elimu/{model => entity}/admin/Application.java (95%) rename src/main/java/ai/elimu/{model => entity}/admin/ApplicationVersion.java (96%) rename src/main/java/ai/elimu/{model => entity}/analytics/LearningEvent.java (94%) rename src/main/java/ai/elimu/{model => entity}/analytics/LetterLearningEvent.java (92%) rename src/main/java/ai/elimu/{model => entity}/analytics/StoryBookLearningEvent.java (93%) rename src/main/java/ai/elimu/{model => entity}/analytics/WordLearningEvent.java (89%) rename src/main/java/ai/elimu/{model => entity}/content/Content.java (94%) rename src/main/java/ai/elimu/{model => entity}/content/Emoji.java (98%) rename src/main/java/ai/elimu/{model => entity}/content/Letter.java (94%) rename src/main/java/ai/elimu/{model => entity}/content/LetterSoundCorrespondence.java (91%) rename src/main/java/ai/elimu/{model => entity}/content/Number.java (96%) rename src/main/java/ai/elimu/{model => entity}/content/Sound.java (98%) rename src/main/java/ai/elimu/{model => entity}/content/StoryBook.java (93%) rename src/main/java/ai/elimu/{model => entity}/content/StoryBookChapter.java (87%) rename src/main/java/ai/elimu/{model => entity}/content/StoryBookParagraph.java (95%) rename src/main/java/ai/elimu/{model => entity}/content/Syllable.java (95%) rename src/main/java/ai/elimu/{model => entity}/content/Word.java (98%) rename src/main/java/ai/elimu/{model => entity}/content/multimedia/Audio.java (94%) rename src/main/java/ai/elimu/{model => entity}/content/multimedia/Image.java (96%) rename src/main/java/ai/elimu/{model => entity}/content/multimedia/Multimedia.java (93%) rename src/main/java/ai/elimu/{model => entity}/content/multimedia/Video.java (96%) rename src/main/java/ai/elimu/{model => entity}/contributor/AudioContributionEvent.java (79%) rename src/main/java/ai/elimu/{model => entity}/contributor/AudioPeerReviewEvent.java (95%) rename src/main/java/ai/elimu/{model => entity}/contributor/ContributionEvent.java (94%) rename src/main/java/ai/elimu/{model => entity}/contributor/Contributor.java (97%) rename src/main/java/ai/elimu/{model => entity}/contributor/ImageContributionEvent.java (79%) rename src/main/java/ai/elimu/{model => entity}/contributor/LetterContributionEvent.java (83%) rename src/main/java/ai/elimu/{model => entity}/contributor/LetterSoundCorrespondenceContributionEvent.java (86%) rename src/main/java/ai/elimu/{model => entity}/contributor/LetterSoundCorrespondencePeerReviewEvent.java (96%) rename src/main/java/ai/elimu/{model => entity}/contributor/NumberContributionEvent.java (82%) rename src/main/java/ai/elimu/{model => entity}/contributor/NumberPeerReviewEvent.java (95%) rename src/main/java/ai/elimu/{model => entity}/contributor/PeerReviewEvent.java (93%) rename src/main/java/ai/elimu/{model => entity}/contributor/SoundContributionEvent.java (83%) rename src/main/java/ai/elimu/{model => entity}/contributor/StoryBookContributionEvent.java (90%) rename src/main/java/ai/elimu/{model => entity}/contributor/StoryBookPeerReviewEvent.java (95%) rename src/main/java/ai/elimu/{model => entity}/contributor/WordContributionEvent.java (83%) rename src/main/java/ai/elimu/{model => entity}/contributor/WordPeerReviewEvent.java (95%) create mode 100644 src/main/java/ai/elimu/entity/enums/CodeLicense.java rename src/main/java/ai/elimu/{model => entity}/enums/ContentLicense.java (88%) rename src/main/java/ai/elimu/{model => entity}/enums/PeerReviewStatus.java (72%) rename src/main/java/ai/elimu/{model => entity}/enums/Platform.java (67%) rename src/main/java/ai/elimu/{model => entity}/enums/Provider.java (78%) rename src/main/java/ai/elimu/{model => entity}/enums/Role.java (90%) rename src/main/java/ai/elimu/{model => entity}/enums/StoryBookProvider.java (86%) delete mode 100644 src/main/java/ai/elimu/model/enums/CodeLicense.java diff --git a/DB_MIGRATION.md b/DB_MIGRATION.md index 6f36c94af..1c1584dc3 100644 --- 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 index 8adb1b58b..d4de53a84 100644 --- 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 index fa3a5916b..6a4e6fa31 100644 --- 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 index b7fbe6e33..a2f91525b 100644 --- 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 index d3dc5494b..2211ade91 100644 --- 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 index 25a65c5c3..de536e206 100644 --- 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 index 67623e3a8..af40fda38 100644 --- 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 { diff --git a/src/main/java/ai/elimu/dao/DbMigrationDao.java b/src/main/java/ai/elimu/dao/DbMigrationDao.java index 84ae77cc7..74b5b552e 100644 --- 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 index 482c2543c..ad79cf1d6 100644 --- 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 index 087454345..f714c094c 100644 --- 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 index abe403d44..1d3f9b958 100644 --- 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 index 5638ae9fc..a0a8d25fd 100644 --- 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 { diff --git a/src/main/java/ai/elimu/dao/LetterContributionEventDao.java b/src/main/java/ai/elimu/dao/LetterContributionEventDao.java index 6d22f0c20..e8164ff4c 100644 --- 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 index 1da19c6b5..19d12c49e 100644 --- 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 index 5e5790856..d6cb8f4be 100644 --- 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 index 088558de9..d9ea6aad2 100644 --- 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 index 7c60bffab..e5c29378d 100644 --- 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 index 196e4aee6..15a56c205 100644 --- 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 index 8e19f1602..6cb7ff0cc 100644 --- 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 index 612ec0ddd..5f964991b 100644 --- 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 index 083cb8f56..addccb0d7 100644 --- 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 index c1349c80c..c21955dfd 100644 --- 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 index e31fa5bd1..f01540dfb 100644 --- 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 index def6ea6c2..68cf7449f 100644 --- 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 index acbddd3e4..0af40d9b6 100644 --- 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 index 53b00aa57..77d710ed8 100644 --- 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 index b2f252cc9..119c14424 100644 --- 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 index 5dbb99731..ba5e1d922 100644 --- 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 index 6a6582b12..266230af9 100644 --- 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 index c07b027fa..265784a7c 100644 --- 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 index 75e630b2e..6941fb0f8 100644 --- 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 index dce673839..3a26a1c6c 100644 --- 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 index 4b9f0f2e7..491caf26b 100644 --- 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 index add068d9b..46ce04ea2 100644 --- 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 index 2617a31d6..86890e0de 100644 --- 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 index 2f42f5e80..8b13366f2 100644 --- 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; diff --git a/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java index 5e9a48b57..6cc43f586 100644 --- a/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java +++ b/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java @@ -3,8 +3,8 @@ import java.util.List; import javax.persistence.NoResultException; import ai.elimu.dao.ApplicationVersionDao; -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/jpa/AudioContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java index 96fa37d05..9d3d44584 100644 --- a/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java +++ b/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java @@ -1,9 +1,9 @@ package ai.elimu.dao.jpa; -import ai.elimu.model.contributor.AudioContributionEvent; +import ai.elimu.entity.contributor.AudioContributionEvent; import ai.elimu.dao.AudioContributionEventDao; -import ai.elimu.model.content.multimedia.Audio; -import ai.elimu.model.contributor.Contributor; +import ai.elimu.entity.content.multimedia.Audio; +import ai.elimu.entity.contributor.Contributor; import java.util.List; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java index 7cf3ef27f..1521bf5e8 100644 --- a/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java +++ b/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java @@ -4,12 +4,12 @@ import javax.persistence.NoResultException; import ai.elimu.dao.AudioDao; -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 org.springframework.dao.DataAccessException; -import ai.elimu.model.content.multimedia.Audio; +import ai.elimu.entity.content.multimedia.Audio; public class AudioDaoJpa extends GenericDaoJpa