taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed issues

main
Said Gedik 2024-06-20 19:22:00 +02:00
parent d264c406bc
commit e2d9793871
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
View File

@ -282,7 +282,7 @@ public class KalenderRestController {
@ResponseBody @ResponseBody
public ChangeUpdateRequest updateChange(@RequestBody ChangeUpdateRequest request, HttpServletRequest httpRequest) public ChangeUpdateRequest updateChange(@RequestBody ChangeUpdateRequest request, HttpServletRequest httpRequest)
throws ARException, ValidationError { throws ARException, ValidationError {
httpRequest.setAttribute("changeUpdateRequest", request); httpRequest.setAttribute("requestBody", request);
change.modifyTimestamp(request); change.modifyTimestamp(request);
return request; return request;
} }
@ -302,7 +302,7 @@ public class KalenderRestController {
@PostMapping("/api/updateState") @PostMapping("/api/updateState")
public ResponseEntity<String> updateState(@RequestBody StateChangeRequest request, HttpServletRequest httpRequest) throws ARException { public ResponseEntity<String> updateState(@RequestBody StateChangeRequest request, HttpServletRequest httpRequest) throws ARException {
logRequest("/updateState", request.toString()); logRequest("/updateState", request.toString());
httpRequest.setAttribute("changeUpdateState", request); httpRequest.setAttribute("requestBody", request);
var response = stateChange.createStateChange(request); var response = stateChange.createStateChange(request);
return ResponseEntity.ok(response); return ResponseEntity.ok(response);
} }

4
backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java
View File

@ -53,11 +53,11 @@ public class RequestInterceptor implements HandlerInterceptor {
if (requestBody instanceof ChangeUpdateRequest) { if (requestBody instanceof ChangeUpdateRequest) {
ChangeUpdateRequest changeUpdateRequest = (ChangeUpdateRequest) requestBody; ChangeUpdateRequest changeUpdateRequest = (ChangeUpdateRequest) requestBody;
changeNr = changeUpdateRequest.getChangeNr(); changeNr += changeUpdateRequest.getChangeNr();
action += " | Date change"; action += " | Date change";
} else if (requestBody instanceof StateChangeRequest) { } else if (requestBody instanceof StateChangeRequest) {
StateChangeRequest changeStateRequest = (StateChangeRequest) requestBody; StateChangeRequest changeStateRequest = (StateChangeRequest) requestBody;
changeNr = changeStateRequest.getChangeNr(); changeNr += changeStateRequest.getChangeNr();
action += " | State transition"; action += " | State transition";
} }

2
backend/src/main/java/com/nttdata/calender/changes/Change.java
View File

@ -212,6 +212,8 @@ public class Change {
.addFieldId("FullName", 1000000017) .addFieldId("FullName", 1000000017)
.addFieldId("SupportGroupId", 1000000079) .addFieldId("SupportGroupId", 1000000079)
.build(); .build();
System.out.println(api.getUser());
var peopleInfos = api.queryFieldsById("\'Login ID\' = \"" + api.getUser() + "\"", var peopleInfos = api.queryFieldsById("\'Login ID\' = \"" + api.getUser() + "\"",
queryPerson.getFieldIds(), queryPerson.getFieldIds(),
queryPerson.getFormName(), null, 0, 0); queryPerson.getFormName(), null, 0, 0);