Merge branch 'main' into 1532_Do_not_allow_words_that_are_digits

# Conflicts:
#	src/main/java/ai/elimu/web/content/word/WordCreateController.java
#	src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java

src/main/java/ai/elimu/web/content/word/WordCreateController.java

@@ -113,8 +113,16 @@ public String handleSubmit(
             Model model) {
     	logger.info("handleSubmit");
 
-        validateWord(word, result);
+        Word existingWord = wordDao.readByTextAndType(word.getText(), word.getWordType());
+        if (existingWord != null) {
+            result.rejectValue("text", "NonUnique");
+        }
 
+        if (StringUtils.containsAny(word.getText(), " ")) {
+            result.rejectValue("text", "WordSpace");
+        }
+        validateWord(word, result);
+
         if (result.hasErrors()) {
             model.addAttribute("word", word);
             model.addAttribute("timeStart", request.getParameter("timeStart"));
@@ -271,7 +279,7 @@ private void autoSelectLetterSoundCorrespondences(Word word) {
     }
 
     private void validateWord(Word word, BindingResult result) {
-        Word existingWord = wordDao.readByText(word.getText());
+        Word existingWord = wordDao.readByTextAndType(word.getText());
 
         if (existingWord != null) {
             result.rejectValue("text", "NonUnique");

src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java

@@ -1,5 +1,11 @@
 package ai.elimu.web.content.word;
 
+import ai.elimu.dao.WordDao;
+import ai.elimu.model.content.Word;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.CoreMatchers.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,12 +35,12 @@ public class WordCreateControllerTest {
 
     @Autowired
     private WordCreateController wordCreateController;
-
+    
     private MockMvc mockMvc;
 
     @Autowired
     private WordDao wordDao;
-    
+
     @Before
     public void setup() {
         assertNotNull(wordCreateController);
@@ -62,6 +68,31 @@ public void testHandleSubmit_emptyText() throws Exception {
 //        assertEquals("content/word/create", mvcResult.getModelAndView().getViewName());
     }
 
+    @Test
+    public void testHandleSubmit_success() throws Exception {
+        Word wordHello = wordDao.readByText("hello");
+        assertThat(wordHello, is(nullValue()));
+
+        int numberOfWordsBefore = wordDao.readAll().size();
+
+        RequestBuilder requestBuilder = MockMvcRequestBuilders
+                .post("/content/word/create")
+                .param("timeStart", String.valueOf(System.currentTimeMillis()))
+                .param("text", "hello")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        MvcResult mvcResult = mockMvc.perform(requestBuilder).andReturn();
+
+        wordHello = wordDao.readByText("hello");
+        assertThat(wordHello, not(nullValue()));
+        assertThat(wordHello.getText(), is("hello"));
+
+        int numberOfWordsAfter = wordDao.readAll().size();
+        assertThat(numberOfWordsAfter, is(numberOfWordsBefore + 1));
+
+        assertEquals(HttpStatus.MOVED_TEMPORARILY.value(), mvcResult.getResponse().getStatus());
+        assertEquals("redirect:/content/word/list#" + wordHello.getId(), mvcResult.getModelAndView().getViewName());
+    }
+
     @Test
     public void testValidateDigitsInWord() throws Exception {
         assertTrue(containGivenErrorCode(getBindingResult(getRequestWithSpecificText("10")).getAllErrors(), "WordNumbers"));