work in progres

Author: thomaswoehlke

.gitignore

@@ -34,4 +34,4 @@ setenv.cmd
 /src/main/java/org/woehlke/simpleworklist/task/x.txt
 /src/main/java/org/woehlke/simpleworklist/context/x.txt
 /src/main/java/org/woehlke/simpleworklist/error/x.txt
-/src/main/java/org/woehlke/simpleworklist/search/x.txt
+/src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt

etc/serialversions/classpath.txt

@@ -35,13 +35,13 @@ serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> ..\..\etc\serialv
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
-@rem serialver org.woehlke.simpleworklist.user.UserDetailsBean >> ..\..\etc\serialversions.txt
+@rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt
 cd ..\..

etc/serialversions/getserialversionid.cmd

@@ -53,7 +53,7 @@ serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SE
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
-#serialver org.woehlke.simpleworklist.user.UserDetailsBean >> $SERIALVERSIONS_FILE
+#serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
 cd $PROJECT_PATH

etc/serialversions/getserialversionid.sh

@@ -18,7 +18,7 @@ org.woehlke.simpleworklist.breadcrumb.Breadcrumb:    private static final long s
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
 org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
 org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
-org.woehlke.simpleworklist.search.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
+org.woehlke.simpleworklist.searchRequest.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.user.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.context.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;

etc/serialversions/serialversions.txt

@@ -49,8 +49,8 @@ function testing() {
 }
 
 function run() {
-    runHerokuLocal
-    #runDev
+    #runHerokuLocal
+    runDev
 }
 
 function main() {

run.sh

@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static java.util.Locale.GERMAN;
+
 /**
  * Created by tw on 14.02.16.
  */
@@ -60,17 +62,23 @@ public abstract class AbstractController {
     @Autowired
     protected BreadcrumbService breadcrumbService;
 
+    //TODO: rename allCategories to allProjects
     @ModelAttribute("allCategories")
-    public final List<Project> getAllCategories(@ModelAttribute("userSession") UserSessionBean userSession,
-                                                BindingResult result, Model model) {
+    public final List<Project> getAllCategories(
+        @ModelAttribute("userSession") UserSessionBean userSession,
+        BindingResult result, //TODO: remove
+        Model model  //TODO: remove
+    ) {
         Context context = this.getContext(userSession);
         return projectService.findAllProjectsByContext(context);
     }
 
+    //TODO: rename rootCategories to rootProjects
     @ModelAttribute("rootCategories")
     public final List<Project> getRootCategories(
-            @ModelAttribute("userSession") UserSessionBean userSession,
-             BindingResult result, Model model
+        @ModelAttribute("userSession") UserSessionBean userSession,
+        BindingResult result,  //TODO: remove
+        Model model  //TODO: remove
     ) {
         Context context = this.getContext(userSession);
         return projectService.findRootProjectsByContext(context);
@@ -108,10 +116,18 @@ public final List<TaskState> getTaskStates(){
     }
 
     @ModelAttribute("context")
-    public final String getCurrentArea(@ModelAttribute("userSession") UserSessionBean userSession,
-                                       Locale locale){
-        Context context = this.getContext(userSession);
-        if(locale == Locale.GERMAN){
+    public final String getCurrentContext(
+        @ModelAttribute("userSession") UserSessionBean userSession,
+        @ModelAttribute("userSession") Locale locale
+    ){
+        if(userSession == null){
+            userSession = new UserSessionBean();
+        }
+        if(locale == null){
+            locale = Locale.ENGLISH;
+        }
+        Context context = getContext(userSession);
+        if(locale == GERMAN){
             return context.getNameDe();
         } else {
             return context.getNameEn();
@@ -123,21 +139,17 @@ public final boolean refreshMessagePage(){
         return false;
     }
 
-    protected UserAccount getUser(){
+    protected UserAccount getUser() {
         return this.userAccountLoginSuccessService.retrieveCurrentUser();
     }
 
     protected Context getContext(UserSessionBean userSession){
         UserAccount thisUser = this.getUser();
         long defaultContextId = thisUser.getDefaultContext().getId();
-        if(userSession == null){
-            userSession = new UserSessionBean(defaultContextId);
-        }
-        long contextId = userSession.getContextId();
-        if(contextId == 0){
-            userSession.setContextId(defaultContextId);
-        }
-        return contextService.findByIdAndUserAccount(contextId, thisUser);
+        Context context = contextService.findByIdAndUserAccount(defaultContextId, thisUser);
+        userSession.setLastContextId(context.getId());
+        userSession.setUserAccountid(thisUser.getId());
+        return context;
     }
 
 }

src/main/java/org/woehlke/simpleworklist/common/AbstractController.java

@@ -11,12 +11,11 @@
 import java.util.Date;
 import java.util.Objects;
 
-;
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 @JsonIgnoreProperties(
-        value = {"rowCreatedAt", "rowUpdatedAt"},
-        allowGetters = true
+    value = {"rowCreatedAt", "rowUpdatedAt"},
+    allowGetters = true
 )
 public class AuditModel implements Serializable {
 
@@ -25,14 +24,14 @@ public class AuditModel implements Serializable {
     @Column(name="uuid", nullable = false)
     protected String uuid;
 
+    @CreatedDate
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "row_created_at", nullable = false, updatable = false)
-    @CreatedDate
     protected Date rowCreatedAt;
 
+    @LastModifiedDate
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "row_updated_at", nullable = false)
-    @LastModifiedDate
     protected Date rowUpdatedAt;
 
     public String getUuid() {

src/main/java/org/woehlke/simpleworklist/common/AuditModel.java

@@ -38,8 +38,8 @@
 @Getter
 @Setter
 @NoArgsConstructor
-@EqualsAndHashCode
-@ToString
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class Context extends AuditModel implements Serializable, ComparableById<Context> {
 
     private static final long serialVersionUID = -5035732370606951871L;

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

@@ -29,16 +29,18 @@ public ContextController(ContextService contextService) {
 
     @RequestMapping(path = "/choose/{newContextId}", method = RequestMethod.GET)
     public String switchContxt(
-        @PathVariable("newContextId") Context setContext,
+        @PathVariable("newContextId") Context newContext,
         @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ){
         log.info("switchContxt");
-        Context isContext = super.getContext(userSession);
-        if (setContext != null) {
-            userSession.setContextId(setContext.getId());
+        Context oldContext = super.getContext(userSession);
+        if (newContext != null) {
+            userSession.setLastContextId(newContext.getId());
+        } else {
+            userSession.setLastContextId(oldContext.getId());
         }
-        model.addAttribute("userSession",userSession);
+        model.addAttribute("userSession", userSession);
         return "redirect:/taskstate/inbox";
     }
 }