URL PATH of Actions - Controller Methods Refactoring

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/context/ContextService.java

@@ -13,9 +13,9 @@ public interface ContextService {
 
     Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
 
-    void createNewContext(NewContextForm newContext, UserAccount user);
+    Context createNewContext(NewContextForm newContext, UserAccount user);
 
-    void updateContext(Context context);
+    Context updateContext(Context context);
 
     boolean delete(Context context);
 

src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java

@@ -47,20 +47,20 @@ public Context findByIdAndUserAccount(long newContextId, UserAccount userAccount
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void createNewContext(NewContextForm newContext, UserAccount user) {
+    public Context createNewContext(NewContextForm newContext, UserAccount user) {
         log.info("createNewContext");
         Context context = new Context();
         context.setNameEn(newContext.getNameEn());
         context.setNameDe(newContext.getNameDe());
         context.setUserAccount(user);
-        contextRepository.saveAndFlush(context);
+        return contextRepository.saveAndFlush(context);
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void updateContext(Context context) {
+    public Context updateContext(Context context) {
         log.info("updateContext");
-        contextRepository.saveAndFlush(context);
+        return contextRepository.saveAndFlush(context);
     }
 
     @Override

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

@@ -0,0 +1,38 @@
+package org.woehlke.simpleworklist.config;
+
+import lombok.Getter;
+import org.woehlke.simpleworklist.context.NewContextForm;
+import org.woehlke.simpleworklist.language.Language;
+import org.woehlke.simpleworklist.user.account.UserAccount;
+
+import java.util.Date;
+
+@Getter
+public class TestDataUser {
+
+    private final String[] emails = { "test01@test.de", "test02@test.de", "test03@test.de" };
+    private final String[] passwords = { "test01pwd", "test02pwd", "test03pwd"};
+    private final String[] fullnames = { "test01 Name", "test02 Name", "test03 Name"};
+
+    private final String username_email = "undefined@test.de";
+    private final String password = "ASDFG";
+    private final String full_name = "UNDEFINED_NAME";
+
+    private final UserAccount[] testUser;
+    private final NewContextForm[] newContext;
+
+    public TestDataUser(){
+        Date lastLoginTimestamp = new Date();
+        testUser = new UserAccount[emails.length];
+        newContext = new NewContextForm[emails.length];
+        for (int i = 0; i < testUser.length; i++) {
+            testUser[i] = new UserAccount();
+            testUser[i].setUserEmail(emails[i]);
+            testUser[i].setUserPassword(passwords[i]);
+            testUser[i].setUserFullname(fullnames[i]);
+            testUser[i].setDefaultLanguage(Language.EN);
+            testUser[i].setLastLoginTimestamp(lastLoginTimestamp);
+            newContext[i] = new NewContextForm("testDe_"+i,"testEn_"+i);
+        }
+    }
+}

src/test/java/org/woehlke/simpleworklist/userstories/F001ServerStartsTest.java

@@ -15,6 +15,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 import org.woehlke.simpleworklist.config.ApplicationProperties;
+import org.woehlke.simpleworklist.config.TestDataUser;
 import org.woehlke.simpleworklist.context.ContextService;
 import org.woehlke.simpleworklist.context.NewContextForm;
 import org.woehlke.simpleworklist.language.Language;
@@ -54,39 +55,20 @@ public class F001ServerStartsTest {
     @Autowired
     protected ContextService contextService;
 
-    protected static String[] emails = {"test01//@Test.de", "test02//@Test.de", "test03//@Test.de"};
-    protected static String[] passwords = {"test01pwd", "test02pwd", "test03pwd"};
-    protected static String[] fullnames = {"test01 Name", "test02 Name", "test03 Name"};
-
-    protected static String username_email = "undefined//@Test.de";
-    protected static String password = "ASDFG";
-    protected static String full_name = "UNDEFINED_NAME";
-
-    protected static UserAccount[] testUser = new UserAccount[emails.length];
-
-    static {
-        Date lastLoginTimestamp = new Date();
-        for (int i = 0; i < testUser.length; i++) {
-            testUser[i] = new UserAccount();
-            testUser[i].setUserEmail(emails[i]);
-            testUser[i].setUserPassword(passwords[i]);
-            testUser[i].setUserFullname(fullnames[i]);
-            testUser[i].setDefaultLanguage(Language.EN);
-            testUser[i].setLastLoginTimestamp(lastLoginTimestamp);
-        }
-    }
+    private TestDataUser testDataUser = new TestDataUser();
 
     @BeforeEach
     public void setUp() throws Exception {
         log.info(" //@BeforeEach ");
         this.base = new URL("http://localhost:" + port + "/");
         this.mockMvc = webAppContextSetup(wac).build();
-        for (UserAccount u : testUser) {
-            UserAccount a = userAccountService.findByUserEmail(u.getUserEmail());
+        for (int i = 0; i < testDataUser.getTestUser().length; i++) {
+            UserAccount a = userAccountService.findByUserEmail(testDataUser.getTestUser()[i].getUserEmail());
             if (a == null) {
-                NewContextForm newContext = new NewContextForm("test","test");
-                contextService.createNewContext(newContext,u);
-                userAccountService.saveAndFlush(u);
+                //NewContextForm newContext = new NewContextForm("test","test");
+                //contextService.createNewContext(newContext,u);
+                UserAccount persisted = userAccountService.saveAndFlush(testDataUser.getTestUser()[i]);
+                testDataUser.getTestUser()[i] = persisted;
             }
         }
     }