diff --git a/.github/workflows/maven-regression-tests-ENG.yml b/.github/workflows/maven-regression-tests-ENG.yml new file mode 100644 index 000000000..8e46a247e --- /dev/null +++ b/.github/workflows/maven-regression-tests-ENG.yml @@ -0,0 +1,33 @@ +name: Maven Regression Tests (eng.elimu.ai) + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + test_rest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-rest -D base.url=http://eng.elimu.ai + + test_ui: + needs: test_rest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-ui -D base.url=http://eng.elimu.ai -D headless=true diff --git a/.github/workflows/maven-regression-tests-HIN.yml b/.github/workflows/maven-regression-tests-HIN.yml new file mode 100644 index 000000000..a748d21c6 --- /dev/null +++ b/.github/workflows/maven-regression-tests-HIN.yml @@ -0,0 +1,33 @@ +name: Maven Regression Tests (hin.elimu.ai) + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + test_rest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-rest -D base.url=http://hin.elimu.ai + + test_ui: + needs: test_rest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-ui -D base.url=http://hin.elimu.ai -D headless=true diff --git a/.github/workflows/maven-regression-tests-PROD.yml b/.github/workflows/maven-regression-tests-PROD.yml deleted file mode 100644 index b5a0ae03c..000000000 --- a/.github/workflows/maven-regression-tests-PROD.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Maven Regression Tests (PROD) - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - test_lang-HIN: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: maven - - run: mvn clean - - run: mvn compile - - run: mvn verify -P regression-test-rest -D base.url=http://hin.elimu.ai - - run: mvn verify -P regression-test-ui -D base.url=http://hin.elimu.ai -D headless=true - - test_lang-TGL: - needs: test_lang-HIN - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: maven - - run: mvn clean - - run: mvn compile - - run: mvn verify -P regression-test-rest -D base.url=http://tgl.elimu.ai - - run: mvn verify -P regression-test-ui -D base.url=http://tgl.elimu.ai -D headless=true - - test_lang-THA: - needs: test_lang-TGL - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: maven - - run: mvn clean - - run: mvn compile - - run: mvn verify -P regression-test-rest -D base.url=http://tha.elimu.ai - - run: mvn verify -P regression-test-ui -D base.url=http://tha.elimu.ai -D headless=true - - test_lang-VIE: - needs: test_lang-THA - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: maven - - run: mvn clean - - run: mvn compile - - run: mvn verify -P regression-test-rest -D base.url=http://vie.elimu.ai - - run: mvn verify -P regression-test-ui -D base.url=http://vie.elimu.ai -D headless=true - - test_lang-ENG: - needs: test_lang-VIE - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - cache: maven - - run: mvn clean - - run: mvn compile - - run: mvn verify -P regression-test-rest -D base.url=http://eng.elimu.ai - - run: mvn verify -P regression-test-ui -D base.url=http://eng.elimu.ai -D headless=true diff --git a/.github/workflows/maven-regression-tests-TGL.yml b/.github/workflows/maven-regression-tests-TGL.yml new file mode 100644 index 000000000..fccf9cc80 --- /dev/null +++ b/.github/workflows/maven-regression-tests-TGL.yml @@ -0,0 +1,33 @@ +name: Maven Regression Tests (tgl.elimu.ai) + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + test_rest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-rest -D base.url=http://tgl.elimu.ai + + test_ui: + needs: test_rest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-ui -D base.url=http://tgl.elimu.ai -D headless=true diff --git a/.github/workflows/maven-regression-tests-THA.yml b/.github/workflows/maven-regression-tests-THA.yml new file mode 100644 index 000000000..72ecdfca3 --- /dev/null +++ b/.github/workflows/maven-regression-tests-THA.yml @@ -0,0 +1,33 @@ +name: Maven Regression Tests (tha.elimu.ai) + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + test_rest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-rest -D base.url=http://tha.elimu.ai + + test_ui: + needs: test_rest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-test-ui -D base.url=http://tha.elimu.ai -D headless=true diff --git a/pom-dependency-tree.txt b/pom-dependency-tree.txt index 6a20b32b6..cb8e50418 100644 --- a/pom-dependency-tree.txt +++ b/pom-dependency-tree.txt @@ -1,4 +1,4 @@ -ai.elimu:webapp:war:2.5.101-SNAPSHOT +ai.elimu:webapp:war:2.5.102-SNAPSHOT +- ai.elimu:model:jar:model-2.0.97:compile | \- com.google.code.gson:gson:jar:2.13.0:compile | \- com.google.errorprone:error_prone_annotations:jar:2.37.0:compile diff --git a/src/main/java/ai/elimu/web/content/word/WordListController.java b/src/main/java/ai/elimu/web/content/word/WordListController.java index a00ed87df..f6ca1dac2 100644 --- a/src/main/java/ai/elimu/web/content/word/WordListController.java +++ b/src/main/java/ai/elimu/web/content/word/WordListController.java @@ -1,13 +1,10 @@ package ai.elimu.web.content.word; import ai.elimu.dao.EmojiDao; -import ai.elimu.dao.LetterSoundDao; import ai.elimu.dao.WordDao; import ai.elimu.entity.content.Emoji; -import ai.elimu.entity.content.LetterSound; import ai.elimu.entity.content.Word; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,8 +24,6 @@ public class WordListController { private final WordDao wordDao; - private final LetterSoundDao letterSoundDao; - private final EmojiDao emojiDao; @GetMapping @@ -39,21 +34,6 @@ public String handleRequest(Model model) { model.addAttribute("words", words); model.addAttribute("emojisByWordId", getEmojisByWordId()); - List letterSounds = letterSoundDao.readAllOrderedByUsage(); - if (!letterSounds.isEmpty()) { - LetterSound mostUsedLetterSound = letterSounds.get(0); - for (Word word : words) { - log.info("word.getText(): " + word.getText()); - log.info("word.getLetterSounds(): " + word.getLetterSounds()); - if (word.getLetterSounds().isEmpty()) { - // Store temporary letters - word.setLetterSounds(Arrays.asList(mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound, mostUsedLetterSound)); - wordDao.update(word); - log.info("word updated: " + word.getId()); - } - } - } - int maxUsageCount = 0; for (Word word : words) { if (word.getUsageCount() > maxUsageCount) {