Added logs (#96)

* Added logs

* Added logs

* Added logs

* Added logs

* Added logs

* Added logs

Author: yashyashm

src/main/java/uk/gov/hmcts/cp/controllers/CourtScheduleController.java

@@ -11,6 +11,8 @@
 import uk.gov.hmcts.cp.services.CaseUrnMapperService;
 import uk.gov.hmcts.cp.services.CourtScheduleService;
 
+import java.util.stream.Collectors;
+
 import static uk.gov.hmcts.cp.utils.Utils.sanitizeString;
 
 @RestController
@@ -31,13 +33,15 @@ public ResponseEntity<CourtScheduleResponse> getCourtScheduleByCaseUrn(final Str
         final CourtScheduleResponse courtScheduleResponse;
         try {
             sanitizedCaseUrn = sanitizeString(caseUrn);
-            String caseId = caseUrnMapperService.getCaseId(sanitizedCaseUrn);
+            LOG.atInfo().log("Received request to get court schedule for caseUrn: {}", sanitizedCaseUrn);
+            final String caseId = caseUrnMapperService.getCaseId(sanitizedCaseUrn);
             courtScheduleResponse = courtScheduleService.getCourtScheduleByCaseId(caseId);
+            LOG.atInfo().log("caseUrn : {} -> Court Schedule Hearing Ids : {}", caseUrn, courtScheduleResponse.getCourtSchedule().stream()
+                    .flatMap(a -> a.getHearings().stream().map(b -> b.getHearingId())).collect(Collectors.joining(",")));
         } catch (ResponseStatusException e) {
             LOG.atError().log(e.getMessage());
             throw e;
         }
-        LOG.atDebug().log("Found court schedule for caseUrn: {}", sanitizedCaseUrn);
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_JSON)
                 .body(courtScheduleResponse);

src/main/java/uk/gov/hmcts/cp/repositories/CourtScheduleClientImpl.java

@@ -52,23 +52,19 @@ public CourtScheduleClientImpl() throws NoSuchAlgorithmException, KeyManagementE
     }
 
     public String getCourtScheduleClientUrl() {
-        LOG.info("courtScheduleClientUrl is : {}", this.courtScheduleClientUrl);
         return this.courtScheduleClientUrl;
     }
 
     public String getCourtScheduleClientPath() {
-        LOG.info("courtScheduleClientPath is : {}", this.courtScheduleClientPath);
         return this.courtScheduleClientPath;
     }
 
     public String getCjscppuid() {
-        LOG.info("cjscppuid is : {}", this.cjscppuid);
         return this.cjscppuid;
     }
 
     public CourtScheduleResponse getCourtScheduleByCaseId(final String caseId) {
         final List<Hearing> hearingList = getHearings(caseId);
-        LOG.info("In function createCourtScheduleResponse Response Body: {} ", hearingList);
         return CourtScheduleResponse.builder()
                 .courtSchedule(List.of(
                                 CourtSchedule.builder()
@@ -137,8 +133,8 @@ private List<Hearing> getHearingData(final HearingResponse hearingResponse)  {
         return hearings;
     }
 
-    private static CourtSitting getCourtSitting(HearingResponse.HearingResult.HearingDay hearingDay, String judiciaryId) {
-        CourtSitting courtSitting = new CourtSitting();
+    private static CourtSitting getCourtSitting(final HearingResponse.HearingResult.HearingDay hearingDay, final String judiciaryId) {
+        final CourtSitting courtSitting = new CourtSitting();
         courtSitting.setSittingStart(OffsetDateTime.parse(hearingDay.getStartTime()));
         courtSitting.setSittingEnd(OffsetDateTime.parse(hearingDay.getEndTime()));
         courtSitting.setJudiciaryId(judiciaryId);

src/main/java/uk/gov/hmcts/cp/services/CaseUrnMapperService.java

@@ -34,7 +34,7 @@ public class CaseUrnMapperService {
     public String getCaseId(final String caseUrn) {
         try {
             ignoreCertificates();
-            ResponseEntity<CaseMapperResponse> responseEntity = restTemplate.exchange(
+            final ResponseEntity<CaseMapperResponse> responseEntity = restTemplate.exchange(
                     getCaseIdUrl(caseUrn),
                     HttpMethod.GET,
                     getRequestEntity(),
@@ -43,31 +43,24 @@ public String getCaseId(final String caseUrn) {
             LOG.atInfo().log(" CaseMapperResponse is : {} and body : {} caseurn : {} ", responseEntity.getStatusCode(), responseEntity.getBody(), caseUrn);
 
             if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.getBody() != null) {
-                CaseMapperResponse body = responseEntity.getBody();
+                final CaseMapperResponse body = responseEntity.getBody();
                 return body.getCaseId();
             }
         } catch (Exception e) {
-            LOG.atError().log("Error while getting case id from case urn", e);
+            LOG.atError().log("Error while getting case id from case urn: {}", caseUrn, e);
         }
         throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Case not found by urn: " + caseUrn);
     }
 
     public String getCaseMapperServiceUrl() {
-//        if (this.caseMapperServiceUrl != null) {
-//            LOG.info(" caseMapperServiceUrl is : {}", this.caseMapperServiceUrl);
-//            return this.caseMapperServiceUrl;
-//        }
-        LOG.info(" caseMapperServiceUrl is : {}", this.caseMapperServiceUrl);
         return this.caseMapperServiceUrl;
     }
 
     public String getCaseMapperServicePath() {
-        LOG.info(" caseMapperServicePath is : {}", this.caseMapperServicePath);
         return this.caseMapperServicePath;
     }
 
-    private String getCaseIdUrl(String caseUrn) {
-        LOG.atDebug().log("Fetching case id for case urn: {}", caseUrn);
+    private String getCaseIdUrl(final String caseUrn) {
         return UriComponentsBuilder
                 .fromUriString(getCaseMapperServiceUrl())
                 .pathSegment(getCaseMapperServicePath())
@@ -77,7 +70,7 @@ private String getCaseIdUrl(String caseUrn) {
     }
 
     private HttpEntity<String> getRequestEntity() {
-        HttpHeaders headers = new HttpHeaders();
+        final HttpHeaders headers = new HttpHeaders();
         headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
         return new HttpEntity<>(headers);
     }

src/main/java/uk/gov/hmcts/cp/services/CourtScheduleService.java

@@ -26,9 +26,7 @@ public CourtScheduleResponse getCourtScheduleByCaseId(final String caseId) throw
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "caseId is required");
         }
         LOG.atWarn().log("NOTE: System configured to return stubbed Court Schedule details. Ignoring provided caseId : {}", sanitizeString(caseId));
-        final CourtScheduleResponse stubbedCourtScheduleResponse = courtScheduleClient.getCourtScheduleByCaseId(caseId);
-        LOG.atDebug().log("Court Schedule response: {}", stubbedCourtScheduleResponse);
-        return stubbedCourtScheduleResponse;
+        return courtScheduleClient.getCourtScheduleByCaseId(caseId);
     }
 
 }

src/main/resources/application.yaml

@@ -46,4 +46,4 @@ azure:
 
 logging:
   level:
-    uk.gov.hmcts.cp: DEBUG
+    uk.gov.hmcts.cp: INFO