Skip to content

Commit 8a50960

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 82a339b commit 8a50960

File tree

2 files changed

+82
-89
lines changed

2 files changed

+82
-89
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/UserChatMessageController.java

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -36,90 +36,89 @@
3636
@RequestMapping(path = "/user2user")
3737
public class UserChatMessageController extends AbstractController {
3838

39+
private final UserChatMessageControllerService userChatMessageControllerService;
3940

40-
private final UserChatMessageControllerService userChatMessageControllerService;
41-
42-
@Autowired
41+
@Autowired
4342
public UserChatMessageController(UserChatMessageControllerService userChatMessageControllerService) {
4443
this.userChatMessageControllerService = userChatMessageControllerService;
4544
}
4645

4746
@RequestMapping(path = "/{userId}/messages/", method = RequestMethod.GET)
48-
public final String getLastMessagesBetweenCurrentAndOtherUser(
49-
@Valid @NotNull @PathVariable("userId") UserAccount otherUser,
50-
@PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,
51-
@ModelAttribute("userSession") UserSessionBean userSession,
52-
Locale locale,
53-
Model model
54-
) {
55-
log.info("getLastMessagesBetweenCurrentAndOtherUser");
56-
log.info("-----------------------------------------------------------------------------------------------");
57-
log.info("Context context");
58-
Context context = super.getContext(userSession);
59-
log.info(context.toString());
60-
log.info("-----------------------------------------------------------------------------------------------");
61-
log.info("UserAccount thisUser");
62-
UserAccount thisUser = context.getUserAccount();
63-
log.info(thisUser.toString());
64-
log.info("-----------------------------------------------------------------------------------------------");
65-
log.info("ChatMessageForm chatMessageForm");
66-
ChatMessageForm chatMessageForm = new ChatMessageForm();
67-
log.info(chatMessageForm.toString());
68-
log.info("-----------------------------------------------------------------------------------------------");
69-
log.info("Page<UserAccountChatMessage> user2UserMessagePage");
70-
Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(
71-
thisUser,otherUser,request
72-
);
73-
for(UserAccountChatMessage o:user2UserMessagePage){
74-
log.info(o.toString());
75-
}
76-
log.info("-----------------------------------------------------------------------------------------------");
77-
log.info("breadcrumb");
78-
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForMessagesBetweenCurrentAndOtherUser(locale,userSession);
79-
log.info("-----------------------------------------------------------------------------------------------");
80-
log.info("model.addAttributes");
81-
model.addAttribute("newUser2UserMessage", chatMessageForm);
82-
model.addAttribute("otherUser", otherUser);
83-
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
84-
model.addAttribute("refreshMessages",true);
85-
model.addAttribute("breadcrumb",breadcrumb);
86-
model.addAttribute("userSession", userSession);
87-
log.info("-----------------------------------------------------------------------------------------------");
88-
log.info("getLastMessagesBetweenCurrentAndOtherUser DONE");
89-
return "user/messages/all";
47+
public final String getLastMessagesBetweenCurrentAndOtherUser(
48+
@Valid @NotNull @PathVariable("userId") UserAccount otherUser,
49+
@PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,
50+
@ModelAttribute("userSession") UserSessionBean userSession,
51+
Locale locale,
52+
Model model
53+
) {
54+
log.info("getLastMessagesBetweenCurrentAndOtherUser");
55+
log.info("-----------------------------------------------------------------------------------------------");
56+
log.info("Context context");
57+
Context context = super.getContext(userSession);
58+
log.info(context.toString());
59+
log.info("-----------------------------------------------------------------------------------------------");
60+
log.info("UserAccount thisUser");
61+
UserAccount thisUser = context.getUserAccount();
62+
log.info(thisUser.toString());
63+
log.info("-----------------------------------------------------------------------------------------------");
64+
log.info("ChatMessageForm chatMessageForm");
65+
ChatMessageForm chatMessageForm = new ChatMessageForm();
66+
log.info(chatMessageForm.toString());
67+
log.info("-----------------------------------------------------------------------------------------------");
68+
log.info("Page<UserAccountChatMessage> user2UserMessagePage");
69+
Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(
70+
thisUser, otherUser, request
71+
);
72+
for (UserAccountChatMessage o : user2UserMessagePage) {
73+
log.info(o.toString());
9074
}
75+
log.info("-----------------------------------------------------------------------------------------------");
76+
log.info("breadcrumb");
77+
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForMessagesBetweenCurrentAndOtherUser(locale, userSession);
78+
log.info("-----------------------------------------------------------------------------------------------");
79+
log.info("model.addAttributes");
80+
model.addAttribute("newUser2UserMessage", chatMessageForm);
81+
model.addAttribute("otherUser", otherUser);
82+
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
83+
model.addAttribute("refreshMessages", true);
84+
model.addAttribute("breadcrumb", breadcrumb);
85+
model.addAttribute("userSession", userSession);
86+
log.info("-----------------------------------------------------------------------------------------------");
87+
log.info("getLastMessagesBetweenCurrentAndOtherUser DONE");
88+
return "user/messages/all";
89+
}
9190

92-
@RequestMapping(path = "/{userId}/messages/", method = RequestMethod.POST)
93-
public final String sendNewMessageToOtherUser(
94-
@PathVariable("userId") UserAccount otherUser,
95-
@Valid @ModelAttribute("newUser2UserMessage") ChatMessageForm chatMessageForm,
96-
BindingResult result,
97-
@PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,
98-
@ModelAttribute("userSession") UserSessionBean userSession,
99-
Locale locale,
100-
Model model
101-
) {
102-
log.info("sendNewMessageToOtherUser");
103-
Context context = super.getContext(userSession);
104-
UserAccount thisUser = context.getUserAccount();
105-
model.addAttribute("userSession",userSession);
106-
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForMessagesBetweenCurrentAndOtherUser(locale,userSession);
107-
model.addAttribute("breadcrumb",breadcrumb);
108-
if(result.hasErrors()){
109-
log.info("result.hasErrors");
110-
for(ObjectError objectError:result.getAllErrors()){
111-
log.info("result.hasErrors: "+objectError.toString());
112-
}
113-
Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
114-
model.addAttribute("otherUser", otherUser);
115-
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
116-
model.addAttribute("userSession", userSession);
117-
return "user/messages/all";
118-
} else {
119-
userChatMessageControllerService.sendNewUserMessage(thisUser, otherUser, chatMessageForm);
120-
model.addAttribute("userSession", userSession);
121-
return "redirect:/user2user/" + otherUser.getId() + "/messages/";
122-
}
91+
@RequestMapping(path = "/{userId}/messages/", method = RequestMethod.POST)
92+
public final String sendNewMessageToOtherUser(
93+
@PathVariable("userId") UserAccount otherUser,
94+
@Valid @ModelAttribute("newUser2UserMessage") ChatMessageForm chatMessageForm,
95+
BindingResult result,
96+
@PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,
97+
@ModelAttribute("userSession") UserSessionBean userSession,
98+
Locale locale,
99+
Model model
100+
) {
101+
log.info("sendNewMessageToOtherUser");
102+
Context context = super.getContext(userSession);
103+
UserAccount thisUser = context.getUserAccount();
104+
model.addAttribute("userSession", userSession);
105+
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForMessagesBetweenCurrentAndOtherUser(locale, userSession);
106+
model.addAttribute("breadcrumb", breadcrumb);
107+
if (result.hasErrors()) {
108+
log.info("result.hasErrors");
109+
for (ObjectError objectError : result.getAllErrors()) {
110+
log.info("result.hasErrors: " + objectError.toString());
111+
}
112+
Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
113+
model.addAttribute("otherUser", otherUser);
114+
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
115+
model.addAttribute("userSession", userSession);
116+
return "user/messages/all";
117+
} else {
118+
userChatMessageControllerService.sendNewUserMessage(thisUser, otherUser, chatMessageForm);
119+
model.addAttribute("userSession", userSession);
120+
return "redirect:/user2user/" + otherUser.getId() + "/messages/";
123121
}
122+
}
124123

125124
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/chat/UserChatMessageControllerServiceImpl.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public UserAccountChatMessage sendNewUserMessage(
4747

4848
@Override
4949
public Page<UserAccountChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
50-
UserAccount receiver,
51-
UserAccount sender,
52-
Pageable request
50+
UserAccount receiver,
51+
UserAccount sender,
52+
Pageable request
5353
) {
5454
log.info("readAllMessagesBetweenCurrentAndOtherUser");
5555
log.info("-----------------------------------------------------------------------------------------------");
@@ -59,23 +59,17 @@ public Page<UserAccountChatMessage> readAllMessagesBetweenCurrentAndOtherUser(
5959
log.info(receiver.toString());
6060
log.info(request.toString());
6161
log.info("Page<UserAccountChatMessage> user2UserMessagePage");
62-
Page<UserAccountChatMessage> user2UserMessagePage = chatMessageService.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);
63-
log.info("Page<UserAccountChatMessage> user2UserMessagePage size: "+user2UserMessagePage.stream().count());
62+
Page<UserAccountChatMessage> user2UserMessagePage = chatMessageService.findAllMessagesBetweenCurrentAndOtherUser(sender, receiver, request);
63+
log.info("Page<UserAccountChatMessage> user2UserMessagePage size: " + user2UserMessagePage.stream().count());
6464
log.info("-----------------------------------------------------------------------------------------------");
65-
for(UserAccountChatMessage userAccountChatMessage : user2UserMessagePage){
65+
for (UserAccountChatMessage userAccountChatMessage : user2UserMessagePage) {
6666
userAccountChatMessage.setReadByReceiver(true);
6767
user2UserMessageList.add(userAccountChatMessage);
68-
/*
69-
if((!userAccountChatMessage.getReadByReceiver()) && (receiver.getId().longValue()== userAccountChatMessage.getReceiver().getId().longValue())){
70-
userAccountChatMessage.setReadByReceiver(true);
71-
userMessageRepository.saveAndFlush(userAccountChatMessage);
72-
}
73-
*/
7468
}
7569
log.info("-----------------------------------------------------------------------------------------------");
7670
log.info("userMessageRepository.saveAll(user2UserMessageList)");
7771
chatMessageService.saveAll(user2UserMessageList);
7872
log.info("-----------------------------------------------------------------------------------------------");
79-
return chatMessageService.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);
73+
return chatMessageService.findAllMessagesBetweenCurrentAndOtherUser(sender, receiver, request);
8074
}
8175
}

0 commit comments

Comments
 (0)