## 2.4.7

* fixed #383 F006 Page after first successful Login: change from inbox to today

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/context/ContextServiceImpl.java

@@ -14,6 +14,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 /**
  * Created by tw on 13.03.16.
@@ -43,6 +44,9 @@ public List<Context> getAllForUser(UserAccount user) {
     @Override
     public Context findByIdAndUserAccount(long newContextId, UserAccount userAccount) {
         log.info("findByIdAndUserAccount");
+        if(userAccount.getUuid()==null){
+          userAccount.setUuid(UUID.randomUUID());
+        }
         if(newContextId == 0){
             newContextId =  userAccount.getDefaultContext().getId();
         }
@@ -53,7 +57,11 @@ public Context findByIdAndUserAccount(long newContextId, UserAccount userAccount
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Context createNewContext(NewContextForm newContext, UserAccount user) {
         log.info("createNewContext");
+        if(user.getUuid()==null){
+          user.setUuid(UUID.randomUUID());
+        }
         Context context = new Context();
+        context.setUuid(UUID.randomUUID());
         context.setNameEn(newContext.getNameEn());
         context.setNameDe(newContext.getNameDe());
         context.setUserAccount(user);
@@ -63,14 +71,20 @@ public Context createNewContext(NewContextForm newContext, UserAccount user) {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Context updateContext(Context context) {
-        log.info("updateContext");
-        return contextRepository.saveAndFlush(context);
+      log.info("updateContext");
+      if(context.getUuid()==null){
+        context.setUuid(UUID.randomUUID());
+      }
+      return contextRepository.saveAndFlush(context);
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public boolean delete(Context context) {
         log.info("delete");
+        if(context.getUuid()==null){
+          context.setUuid(UUID.randomUUID());
+        }
         long contextId = context.getId();
         contextRepository.delete(context);
         return (!contextRepository.existsById(contextId));

src/test/java/org/woehlke/java/simpleworklist/SmokeTests.java

@@ -1,19 +1,23 @@
 package org.woehlke.java.simpleworklist;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Ignore;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
 import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
 
 import java.net.URL;
@@ -32,6 +36,9 @@
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Import(SimpleworklistApplication.class)
+@EnableConfigurationProperties({
+  SimpleworklistProperties.class
+})
 public class SmokeTests {
 
     @Autowired
@@ -47,7 +54,6 @@ public class SmokeTests {
     @Autowired
     private UserAccountTestDataService userAccountTestDataService;
 
-
     private final String eyecatcherH1 = "##################################################################";
     private final String eyecatcherH2 = "------------------------------------------------------------------";
     private final String eyecatcherH3 = "******************************************************************";
@@ -170,6 +176,7 @@ public void testF007AddFirstNewTaskToInbox(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F008)
     @Order(8)
@@ -180,6 +187,7 @@ public void testF008AddAnotherNewTaskToInbox(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F009)
     @Order(9)
@@ -190,6 +198,7 @@ public void testF009AddTaskToProjectRoot(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F010)
     @Order(10)
@@ -200,6 +209,7 @@ public void testF010AddSubProjectToProjectRoot(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F011)
     @Order(11)
@@ -210,6 +220,7 @@ public void testF011SetFocusOfTask(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F012)
     @Order(12)
@@ -220,6 +231,7 @@ public void testF012UnSetFocusOfTask(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F013)
     @Order(13)
@@ -233,7 +245,7 @@ public void testF013ShowTaskstateInbox() throws Exception {
         assertNotNull(this.mockMvc);
         try {
             this.mockMvc.perform(get(base.toString()))
-                //.andDo(print())
+                .andDo(print())
                 .andExpect(status().isOk());
             //.andExpect(content().string(containsString("SimpleWorklist")));
         } catch (UsernameNotFoundException e) {
@@ -247,6 +259,7 @@ public void testF013ShowTaskstateInbox() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F014)
     @Order(14)
@@ -259,12 +272,13 @@ public void testF014ShowTaskstateToday() throws Exception {
         log.info("Server URL: "+ base.toString());
         assertNotNull(this.mockMvc);
         this.mockMvc.perform(get(base.toString()))
-            //.andDo(print())
+            .andDo(print())
             .andExpect(status().isOk());
             //.andExpect(content().string(containsString("SimpleWorklist")));
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F015)
     @Order(15)
@@ -287,6 +301,7 @@ public void testF015ShowTaskstateNext() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F016)
     @Order(16)
@@ -305,6 +320,7 @@ public void testF016ShowTaskstateWaiting() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F017)
     @Order(17)
@@ -323,6 +339,7 @@ public void testF017ShowTaskstateScheduled() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F018)
     @Order(18)
@@ -341,6 +358,7 @@ public void testF018ShowTaskstateSomeday() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F019)
     @Order(19)
@@ -359,6 +377,7 @@ public void testF019ShowTaskstateFocus() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F020)
     @Order(20)
@@ -377,6 +396,7 @@ public void testF020ShowTaskstateCompleted() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F021)
     @Order(21)
@@ -395,6 +415,7 @@ public void testF021ShowTaskstateTrash() throws Exception {
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F022)
     @Order(22)
@@ -405,6 +426,7 @@ public void testF022TaskEdit(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F023)
     @Order(23)
@@ -415,6 +437,7 @@ public void testF023TaskEditFormChangeTaskstateViaDropDown(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F024)
     @Order(24)
@@ -425,6 +448,7 @@ public void testF024TaskComplete(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F025)
     @Order(25)
@@ -435,6 +459,7 @@ public void testF025TaskIncomplete(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F026)
     @Order(26)
@@ -445,6 +470,7 @@ public void testF026TaskDelete(){
         log.info(eyecatcherH2);
     }
 
+
     @WithMockUser(username="test01@test.de")
     @DisplayName(F027)
     @Order(27)

src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataServiceImpl.java

@@ -12,6 +12,7 @@
 import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountService;
 
 import java.util.Date;
+import java.util.UUID;
 
 
 @Slf4j
@@ -48,6 +49,7 @@ public UserAccountTestDataServiceImpl(
         newContext = new NewContextForm[emails.length];
         for (int i = 0; i < testUser.length; i++) {
             testUser[i] = new UserAccount();
+            testUser[i].setUuid(UUID.randomUUID());
             testUser[i].setUserEmail(emails[i]);
             testUser[i].setUserPassword(passwords[i]);
             testUser[i].setUserFullname(fullnames[i]);