Skip to content

Commit

Permalink
OP-23068: BugFix- Implemented code chnages to handle 304 statauscode (#…
Browse files Browse the repository at this point in the history
…500)

Co-authored-by: emanipravallika <[email protected]>
  • Loading branch information
sudhakaropsmx and emanipravallika authored Jan 17, 2025
1 parent ed5566a commit a924a65
Showing 1 changed file with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,14 @@ class OpsmxAuditServiceController {
@RequestMapping(value = "/v1/acctEnvMapping/bulkimport", method = RequestMethod.POST, consumes = "multipart/form-data")
Object bulkImportAcctEnvironmentMappings(@RequestParam("file") MultipartFile data) {
try {
return uploadToAuditService(data)
def response = uploadToAuditService(data)
return ResponseEntity.ok(response)
} catch (OesRequestException e) {
log.error("Audit service request failed: {}", e.message, e)
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.message)
} catch (Exception e) {
throw new RuntimeException("Failed to process file: ${e.message}", e)
log.error("Unexpected error while processing file: {}", e.message, e)
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An unexpected error occurred.")
}
}
private String uploadToAuditService(MultipartFile data) {
Expand All @@ -100,12 +105,15 @@ class OpsmxAuditServiceController {
def response = okHttpClient.newCall(request).execute()
return response
}.call() as okhttp3.Response
if (obj.code() == 304) {
log.info("No changes to process: {}", obj.body()?.string())
return "No changes were made. All records are duplicates."
}
if (!obj.isSuccessful()) {
def errorBody = obj.body()?.string()
log.error("Failed to upload multipart file to audit service: {}", errorBody)
def errorMessage = parseErrorMessage(errorBody, obj.code)

throw new OesRequestException(errorMessage)
def errorBody = obj.body()?.string();
log.error("Failed to upload multipart file to audit service: {}", errorBody);
def errorMessage = parseErrorMessage(errorBody, obj.code());
throw new OesRequestException(errorMessage);
} else {
return obj.body()?.string() ?: "Unknown reason: ${obj.code}" as Object
}
Expand Down

0 comments on commit a924a65

Please sign in to comment.