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

transaction

main
Said Gedik 2024-06-27 15:39:37 +02:00
parent e2d9793871
commit aa2763b4b2
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -1,3 +1,4 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
"java.configuration.updateBuildConfiguration": "automatic",
"java.compile.nullAnalysis.mode": "disabled"
}

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

@ -300,7 +300,8 @@ public class KalenderRestController {
*/
@CrossOrigin("*")
@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());
httpRequest.setAttribute("requestBody", request);
var response = stateChange.createStateChange(request);
@ -318,7 +319,9 @@ public class KalenderRestController {
*/
@CrossOrigin("*")
@PostMapping("api/updateImplementer")
public ResponseEntity<String> updateImplementer(@RequestBody ImplementerUpdateRequest request) throws ARException {
public ResponseEntity<String> updateImplementer(@RequestBody ImplementerUpdateRequest request,
HttpServletRequest httpRequest) throws ARException {
httpRequest.setAttribute("requestBody", request);
var response = implementer.update(request);
return ResponseEntity.ok(response);
}
@ -335,7 +338,9 @@ public class KalenderRestController {
@CrossOrigin("*")
@PostMapping("api/updateApproval")
@ResponseBody
public ResponseEntity<String> updateApproval(@RequestBody ApprovalUpdateRequest request) throws ARException {
public ResponseEntity<String> updateApproval(@RequestBody ApprovalUpdateRequest request,
HttpServletRequest httpRequest) throws ARException {
httpRequest.setAttribute("requestBody", request);
var response = approval.update(request);
return ResponseEntity.ok(response);
}

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

@ -6,7 +6,9 @@ import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import com.nttdata.calender.approval.ApprovalUpdateRequest;
import com.nttdata.calender.changes.ChangeUpdateRequest;
import com.nttdata.calender.implementer.ImplementerUpdateRequest;
import com.nttdata.calender.states.StateChangeRequest;
import javax.servlet.http.HttpServletRequest;
@ -34,7 +36,8 @@ public class RequestInterceptor implements HandlerInterceptor {
private static String output(String time, long id, String user, String status, String action, String ticket,
String result) {
return String.format("%s\nTransaction ID: %d\nUser: %s\nStatus: %s\nAction: %s\nTicket: %s\nResult: %s",
return String.format(
"%s\n Transaction ID: %d\n User: %s\n Status: %s\n Action: %s\n Ticket: %s\n Result: %s",
time, id, user, status, action, ticket, result);
}
@ -59,6 +62,12 @@ public class RequestInterceptor implements HandlerInterceptor {
StateChangeRequest changeStateRequest = (StateChangeRequest) requestBody;
changeNr += changeStateRequest.getChangeNr();
action += " | State transition";
} else if (requestBody instanceof ImplementerUpdateRequest) {
ImplementerUpdateRequest implementerUpdateRequest = (ImplementerUpdateRequest) requestBody;
action += " | Implementer Update";
} else if (requestBody instanceof ApprovalUpdateRequest) {
ApprovalUpdateRequest approvalUpdateRequest = (ApprovalUpdateRequest) requestBody;
action += " | Approval Update";
}
String status = (ex == null) ? "Success" : "Error";