From 961862ad5c67a93bf2a4e4da8f06ddd7484d3369 Mon Sep 17 00:00:00 2001 From: jo-elimu <1451036+jo-elimu@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:51:37 +0700 Subject: [PATCH 1/4] refactor(dao): Rename `letterSoundCorrespondences` Rename Word's property `letterSoundCorrespondences` to `letterSounds`. refs #1677 --- src/main/java/ai/elimu/model/content/Word.java | 10 +++++----- .../java/ai/elimu/rest/v2/JpaToGsonConverter.java | 2 +- ...terSoundCorrespondenceUsageCountScheduler.java | 6 +++--- .../ai/elimu/tasks/SoundUsageCountScheduler.java | 6 +++--- .../ai/elimu/tasks/WordUsageCountScheduler.java | 2 +- .../util/csv/CsvContentExtractionHelper.java | 6 +++--- .../web/content/word/WordCreateController.java | 2 +- .../web/content/word/WordCsvExportController.java | 14 +++++++------- .../web/content/word/WordEditController.java | 8 ++++---- src/main/resources/META-INF/jpa-schema-export.sql | 10 +++++----- src/main/resources/db/migration/2004006.sql | 15 +++++++++++++++ 11 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/db/migration/2004006.sql diff --git a/src/main/java/ai/elimu/model/content/Word.java b/src/main/java/ai/elimu/model/content/Word.java index c85e95bcb..5708fc534 100644 --- a/src/main/java/ai/elimu/model/content/Word.java +++ b/src/main/java/ai/elimu/model/content/Word.java @@ -23,7 +23,7 @@ public class Word extends Content { @NotEmpty @OrderColumn @ManyToMany(fetch = FetchType.EAGER) - private List letterSoundCorrespondences; + private List letterSounds; /** * As an example, the verb "reading" will be linked to the root verb "read". @@ -48,12 +48,12 @@ public void setText(String text) { this.text = text; } - public List getLetterSoundCorrespondences() { - return letterSoundCorrespondences; + public List getLetterSounds() { + return letterSounds; } - public void setLetterSoundCorrespondences(List letterSoundCorrespondences) { - this.letterSoundCorrespondences = letterSoundCorrespondences; + public void setLetterSounds(List letterSounds) { + this.letterSounds = letterSounds; } public Word getRootWord() { diff --git a/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java b/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java index 23bf4334a..8406426d9 100644 --- a/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java +++ b/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java @@ -129,7 +129,7 @@ public static WordGson getWordGson(Word word) { // Word wordGson.setText(word.getText()); List letterSounds = new ArrayList<>(); - for (LetterSoundCorrespondence letterSound : word.getLetterSoundCorrespondences()) { + for (LetterSoundCorrespondence letterSound : word.getLetterSounds()) { LetterSoundGson letterSoundGson = getLetterSoundGson(letterSound); letterSounds.add(letterSoundGson); } diff --git a/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java index d42907ac5..83ba9085d 100644 --- a/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java +++ b/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java @@ -40,9 +40,9 @@ public synchronized void execute() { logger.info("words.size(): " + words.size()); for (Word word : words) { logger.info("word.getText(): " + word.getText()); - for (LetterSoundCorrespondence letterSoundCorrespondence : word.getLetterSoundCorrespondences()) { - letterSoundCorrespondenceFrequencyMap.put(letterSoundCorrespondence.getId(), - letterSoundCorrespondenceFrequencyMap.getOrDefault(letterSoundCorrespondence.getId(), 0) + word.getUsageCount()); + for (LetterSoundCorrespondence letterSound : word.getLetterSounds()) { + letterSoundCorrespondenceFrequencyMap.put(letterSound.getId(), + letterSoundCorrespondenceFrequencyMap.getOrDefault(letterSound.getId(), 0) + word.getUsageCount()); } } diff --git a/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java index 0985b2052..7f9334d43 100644 --- a/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java +++ b/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java @@ -47,9 +47,9 @@ public synchronized void execute() { List words = wordDao.readAllOrdered(); logger.info("words.size(): " + words.size()); for (Word word : words) { - for (LetterSoundCorrespondence letterSoundCorrespondence : word.getLetterSoundCorrespondences()) { - for (Sound sound : letterSoundCorrespondence.getSounds()) { - soundFrequencyMap.put(sound.getId(), soundFrequencyMap.getOrDefault(sound.getId(), 0) + letterSoundCorrespondence.getUsageCount()); + for (LetterSoundCorrespondence letterSound : word.getLetterSounds()) { + for (Sound sound : letterSound.getSounds()) { + soundFrequencyMap.put(sound.getId(), soundFrequencyMap.getOrDefault(sound.getId(), 0) + letterSound.getUsageCount()); } } } diff --git a/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java index bef08c31d..8b488ba55 100644 --- a/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java +++ b/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java @@ -77,7 +77,7 @@ public synchronized void execute() { existingWord.setUsageCount(wordFrequencyMap.get(word)); // Temporary fix for "javax.validation.ConstraintViolationException" - if (existingWord.getLetterSoundCorrespondences().isEmpty()) { + if (existingWord.getLetterSounds().isEmpty()) { logger.warn("Letter-sound correspondences not yet added. Skipping usage count update for word..."); continue; } diff --git a/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java b/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java index 9214cf45a..691fc6d3b 100644 --- a/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java +++ b/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java @@ -158,7 +158,7 @@ public static List getWordsFromCsvBackup(File csvFile, LetterDao letterDao JSONArray letterSoundCorrespondencesJsonArray = new JSONArray(csvRecord.get("letter_sound_correspondences")); logger.info("letterSoundCorrespondencesJsonArray: " + letterSoundCorrespondencesJsonArray); - List letterSoundCorrespondences = new ArrayList<>(); + List letterSounds = new ArrayList<>(); for (int i = 0; i < letterSoundCorrespondencesJsonArray.length(); i++) { JSONObject letterSoundCorrespondenceJsonObject = letterSoundCorrespondencesJsonArray.getJSONObject(i); logger.info("letterSoundCorrespondenceJsonObject: " + letterSoundCorrespondenceJsonObject); @@ -176,9 +176,9 @@ public static List getWordsFromCsvBackup(File csvFile, LetterDao letterDao } LetterSoundCorrespondence letterSoundCorrespondence = letterSoundDao.read(letters, sounds); logger.info("letterSoundCorrespondence.getId(): " + letterSoundCorrespondence.getId()); - letterSoundCorrespondences.add(letterSoundCorrespondence); + letterSounds.add(letterSoundCorrespondence); } - word.setLetterSoundCorrespondences(letterSoundCorrespondences); + word.setLetterSounds(letterSounds); Integer usageCount = Integer.valueOf(csvRecord.get("usage_count")); word.setUsageCount(usageCount); diff --git a/src/main/java/ai/elimu/web/content/word/WordCreateController.java b/src/main/java/ai/elimu/web/content/word/WordCreateController.java index 9ae8d8da4..0603bfcd3 100644 --- a/src/main/java/ai/elimu/web/content/word/WordCreateController.java +++ b/src/main/java/ai/elimu/web/content/word/WordCreateController.java @@ -218,6 +218,6 @@ private void autoSelectLetterSoundCorrespondences(Word word) { } } - word.setLetterSoundCorrespondences(letterSoundCorrespondences); + word.setLetterSounds(letterSoundCorrespondences); } } diff --git a/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java b/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java index a99880834..238220c86 100644 --- a/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java +++ b/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java @@ -59,20 +59,20 @@ public void handleRequest( JSONArray letterSoundCorrespondencesJsonArray = new JSONArray(); int index = 0; - for (LetterSoundCorrespondence letterSoundCorrespondence : word.getLetterSoundCorrespondences()) { + for (LetterSoundCorrespondence letterSound : word.getLetterSounds()) { JSONObject letterSoundCorrespondenceJsonObject = new JSONObject(); - letterSoundCorrespondenceJsonObject.put("id", letterSoundCorrespondence.getId()); - String[] lettersArray = new String[letterSoundCorrespondence.getLetters().size()]; + letterSoundCorrespondenceJsonObject.put("id", letterSound.getId()); + String[] lettersArray = new String[letterSound.getLetters().size()]; for (int i = 0; i < lettersArray.length; i++) { - lettersArray[i] = letterSoundCorrespondence.getLetters().get(i).getText(); + lettersArray[i] = letterSound.getLetters().get(i).getText(); } letterSoundCorrespondenceJsonObject.put("letters", lettersArray); - String[] soundsArray = new String[letterSoundCorrespondence.getSounds().size()]; + String[] soundsArray = new String[letterSound.getSounds().size()]; for (int i = 0; i < soundsArray.length; i++) { - soundsArray[i] = letterSoundCorrespondence.getSounds().get(i).getValueIpa(); + soundsArray[i] = letterSound.getSounds().get(i).getValueIpa(); } letterSoundCorrespondenceJsonObject.put("sounds", soundsArray); - letterSoundCorrespondenceJsonObject.put("usageCount", letterSoundCorrespondence.getUsageCount()); + letterSoundCorrespondenceJsonObject.put("usageCount", letterSound.getUsageCount()); letterSoundCorrespondencesJsonArray.put(index, letterSoundCorrespondenceJsonObject); index++; } diff --git a/src/main/java/ai/elimu/web/content/word/WordEditController.java b/src/main/java/ai/elimu/web/content/word/WordEditController.java index de523ef71..16a4a23d8 100644 --- a/src/main/java/ai/elimu/web/content/word/WordEditController.java +++ b/src/main/java/ai/elimu/web/content/word/WordEditController.java @@ -87,7 +87,7 @@ public String handleRequest( Word word = wordDao.read(id); - if (word.getLetterSoundCorrespondences().isEmpty()) { + if (word.getLetterSounds().isEmpty()) { autoSelectLetterSoundCorrespondences(word); // TODO: display information message to the Contributor that the letter-sound correspondences were auto-selected, and that they should be verified } @@ -232,7 +232,7 @@ private void autoSelectLetterSoundCorrespondences(Word word) { String wordText = word.getText(); - List letterSoundCorrespondences = new ArrayList<>(); + List letterSounds = new ArrayList<>(); List allLetterSoundCorrespondencesOrderedByLettersLength = letterSoundDao.readAllOrderedByLettersLength(); while (StringUtils.isNotBlank(wordText)) { @@ -246,7 +246,7 @@ private void autoSelectLetterSoundCorrespondences(Word word) { if (wordText.startsWith(letterSoundCorrespondenceLetters)) { isMatch = true; logger.info("Found match at the beginning of \"" + wordText + "\""); - letterSoundCorrespondences.add(letterSoundCorrespondence); + letterSounds.add(letterSoundCorrespondence); // Remove the match from the word wordText = wordText.substring(letterSoundCorrespondenceLetters.length()); @@ -260,6 +260,6 @@ private void autoSelectLetterSoundCorrespondences(Word word) { } } - word.setLetterSoundCorrespondences(letterSoundCorrespondences); + word.setLetterSounds(letterSounds); } } diff --git a/src/main/resources/META-INF/jpa-schema-export.sql b/src/main/resources/META-INF/jpa-schema-export.sql index c141d5f91..173092b93 100644 --- a/src/main/resources/META-INF/jpa-schema-export.sql +++ b/src/main/resources/META-INF/jpa-schema-export.sql @@ -647,9 +647,9 @@ create table Word_LetterSoundCorrespondence ( Word_id bigint not null, - letterSoundCorrespondences_id bigint not null, - letterSoundCorrespondences_ORDER integer not null, - primary key (Word_id, letterSoundCorrespondences_ORDER) + letterSounds_id bigint not null, + letterSounds_ORDER integer not null, + primary key (Word_id, letterSounds_ORDER) ) engine=MyISAM; create table WordContributionEvent ( @@ -1078,8 +1078,8 @@ references Word (id); alter table Word_LetterSoundCorrespondence - add constraint FKf6r3yfdc6quwa0b13mln5uuc8 - foreign key (letterSoundCorrespondences_id) + add constraint FK1ln49ylh4w15nddf9h41wjupt + foreign key (letterSounds_id) references LetterSoundCorrespondence (id); alter table Word_LetterSoundCorrespondence diff --git a/src/main/resources/db/migration/2004006.sql b/src/main/resources/db/migration/2004006.sql new file mode 100644 index 000000000..2a35914a3 --- /dev/null +++ b/src/main/resources/db/migration/2004006.sql @@ -0,0 +1,15 @@ +# 2.4.6 + +# Word "letterSoundCorrespondences" → Word "letterSounds" + +ALTER TABLE `Word_LetterSoundCorrespondence` DROP COLUMN `letterSounds_id`; +ALTER TABLE `Word_LetterSoundCorrespondence` CHANGE `letterSoundCorrespondences_id` `letterSounds_id` bigint(20) NOT NULL; + +ALTER TABLE `Word_LetterSoundCorrespondence` DROP COLUMN `letterSounds_ORDER`; +ALTER TABLE `Word_LetterSoundCorrespondence` CHANGE `letterSoundCorrespondences_ORDER` `letterSounds_ORDER` int(11) NOT NULL; + +# Reset primary key +ALTER TABLE `Word_LetterSoundCorrespondence` DROP PRIMARY KEY, ADD PRIMARY KEY(Word_id, letterSounds_ORDER); + +# Delete obsolete foreign key constraint for "letterSoundCorrespondences_id" +ALTER TABLE `Word_LetterSoundCorrespondence` DROP `FKf6r3yfdc6quwa0b13mln5uuc8`; From 780a1cdf5dabe2937d2907c4295354a997dcdc15 Mon Sep 17 00:00:00 2001 From: jo-elimu <1451036+jo-elimu@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:59:16 +0700 Subject: [PATCH 2/4] fix(dao): add missing "FOREIGN KEY" Should be `DROP FOREIGN KEY` refs #1677 --- src/main/resources/db/migration/2004006.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/2004006.sql b/src/main/resources/db/migration/2004006.sql index 2a35914a3..641af9782 100644 --- a/src/main/resources/db/migration/2004006.sql +++ b/src/main/resources/db/migration/2004006.sql @@ -12,4 +12,4 @@ ALTER TABLE `Word_LetterSoundCorrespondence` CHANGE `letterSoundCorrespondences_ ALTER TABLE `Word_LetterSoundCorrespondence` DROP PRIMARY KEY, ADD PRIMARY KEY(Word_id, letterSounds_ORDER); # Delete obsolete foreign key constraint for "letterSoundCorrespondences_id" -ALTER TABLE `Word_LetterSoundCorrespondence` DROP `FKf6r3yfdc6quwa0b13mln5uuc8`; +ALTER TABLE `Word_LetterSoundCorrespondence` DROP FOREIGN KEY `FKf6r3yfdc6quwa0b13mln5uuc8`; From 071901b302ff6d0e4c8f166e2db3a1ffc9be9d49 Mon Sep 17 00:00:00 2001 From: jo-elimu <1451036+jo-elimu@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:45:17 +0700 Subject: [PATCH 3/4] refactor(jsp): rename to `Word#letterSounds` refs #1677 --- .../WEB-INF/jsp/content/contributor/contributor-words.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp | 6 +++--- src/main/webapp/WEB-INF/jsp/content/number/list.jsp | 2 +- .../WEB-INF/jsp/content/number/peer-reviews/pending.jsp | 2 +- src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp | 2 +- src/main/webapp/WEB-INF/jsp/content/word/create.jsp | 8 ++++---- src/main/webapp/WEB-INF/jsp/content/word/edit.jsp | 8 ++++---- src/main/webapp/WEB-INF/jsp/content/word/list.jsp | 2 +- .../WEB-INF/jsp/content/word/peer-reviews/pending.jsp | 2 +- src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp b/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp index 60e6ffd72..cd110c24e 100644 --- a/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/contributor/contributor-words.jsp @@ -20,7 +20,7 @@ ""
- / ${sound.valueIpa} / + / ${sound.valueIpa} / #${wordContributionEvent.revisionNumber}
@@ -157,7 +157,7 @@ ""
- / ${sound.valueIpa} / + / ${sound.valueIpa} / diff --git a/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp index 5bd4a8d6e..fd1f8ed9f 100644 --- a/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp @@ -339,7 +339,7 @@ <%-- Check if the current letter-sound correspondence is used by the word. --%> - + @@ -350,9 +350,9 @@ ""
- " ${letter.text} "
+ " ${letter.text} "
- / ${sound.valueIpa} / + / ${sound.valueIpa} / ${word.usageCount} diff --git a/src/main/webapp/WEB-INF/jsp/content/number/list.jsp b/src/main/webapp/WEB-INF/jsp/content/number/list.jsp index 073d5c895..4748c398f 100644 --- a/src/main/webapp/WEB-INF/jsp/content/number/list.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/number/list.jsp @@ -47,7 +47,7 @@ - / ${sound.valueIpa} / + / ${sound.valueIpa} / diff --git a/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp b/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp index f5dc06db0..a5d541c97 100644 --- a/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/number/peer-reviews/pending.jsp @@ -42,7 +42,7 @@ - / ${sound.valueIpa} / + / ${sound.valueIpa} / diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp index e24da48d9..414b52326 100644 --- a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp @@ -334,7 +334,7 @@ (${word.wordType})
- / ${sound.valueIpa} / + / ${sound.valueIpa} / diff --git a/src/main/webapp/WEB-INF/jsp/content/word/create.jsp b/src/main/webapp/WEB-INF/jsp/content/word/create.jsp index 4d37742ea..9cb71e494 100644 --- a/src/main/webapp/WEB-INF/jsp/content/word/create.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/word/create.jsp @@ -36,8 +36,8 @@
- - + +
clear @@ -63,7 +63,7 @@ $(this).parent().remove(); - var $hiddenInput = $('input[name="letterSoundCorrespondences"][value="' + letterSoundCorrespondenceId + '"]'); + var $hiddenInput = $('input[name="letterSounds"][value="' + letterSoundCorrespondenceId + '"]'); $hiddenInput.remove(); }); }); @@ -89,7 +89,7 @@ var letterSoundCorrespondenceSounds = selectedOption.attr('data-sounds'); console.log('letterSoundCorrespondenceSounds: "' + letterSoundCorrespondenceSounds + '"'); if (letterSoundCorrespondenceId != "") { - $('#letterSoundCorrespondencesContainer').append(''); + $('#letterSoundCorrespondencesContainer').append(''); $('#letterSoundCorrespondencesContainer').append('
"' + letterSoundCorrespondenceLetters + '"
↓
/' + letterSoundCorrespondenceSounds + '/
'); $(this).val(""); } diff --git a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp index 07967f69a..8780bb909 100644 --- a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp @@ -55,8 +55,8 @@
- - + +
clear @@ -82,7 +82,7 @@ $(this).parent().remove(); - var $hiddenInput = $('input[name="letterSoundCorrespondences"][value="' + letterSoundCorrespondenceId + '"]'); + var $hiddenInput = $('input[name="letterSounds"][value="' + letterSoundCorrespondenceId + '"]'); $hiddenInput.remove(); }); }); @@ -108,7 +108,7 @@ var letterSoundCorrespondenceSounds = selectedOption.attr('data-sounds'); console.log('letterSoundCorrespondenceSounds: "' + letterSoundCorrespondenceSounds + '"'); if (letterSoundCorrespondenceId != "") { - $('#letterSoundCorrespondencesContainer').append(''); + $('#letterSoundCorrespondencesContainer').append(''); $('#letterSoundCorrespondencesContainer').append('
"' + letterSoundCorrespondenceLetters + '"
↓
/' + letterSoundCorrespondenceSounds + '/
'); $(this).val(""); } diff --git a/src/main/webapp/WEB-INF/jsp/content/word/list.jsp b/src/main/webapp/WEB-INF/jsp/content/word/list.jsp index dd89306c8..9103ae6d9 100644 --- a/src/main/webapp/WEB-INF/jsp/content/word/list.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/word/list.jsp @@ -47,7 +47,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp b/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp index 5708bd059..c194590b2 100644 --- a/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp +++ b/src/main/webapp/WEB-INF/jsp/content/word/peer-reviews/pending.jsp @@ -30,7 +30,7 @@ "" - / ${sound.valueIpa} / + / ${sound.valueIpa} / ${word.wordType}
diff --git a/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp b/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp index d1060e149..ad1189e4f 100644 --- a/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp +++ b/src/main/webapp/WEB-INF/jsp/contributions/most-recent.jsp @@ -49,7 +49,7 @@ "${word.text}" - / ${sound.valueIpa} / + / ${sound.valueIpa} / ${word.wordType}
From 548500ebffed7c2aa3cf7f079012f68066972d9d Mon Sep 17 00:00:00 2001 From: jo-elimu <1451036+jo-elimu@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:23:49 +0700 Subject: [PATCH 4/4] refactor(db): rename migration script to match new version refs #1677 --- src/main/resources/db/migration/{2004006.sql => 2004007.sql} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/db/migration/{2004006.sql => 2004007.sql} (98%) diff --git a/src/main/resources/db/migration/2004006.sql b/src/main/resources/db/migration/2004007.sql similarity index 98% rename from src/main/resources/db/migration/2004006.sql rename to src/main/resources/db/migration/2004007.sql index 641af9782..650e95c25 100644 --- a/src/main/resources/db/migration/2004006.sql +++ b/src/main/resources/db/migration/2004007.sql @@ -1,4 +1,4 @@ -# 2.4.6 +# 2.4.7 # Word "letterSoundCorrespondences" → Word "letterSounds"