From f992c98f91fccfc8c0ce0b2f542be4034b0af7ce Mon Sep 17 00:00:00 2001 From: akshat-sonic Date: Wed, 22 Feb 2023 13:00:33 +0530 Subject: [PATCH] resolve https://github.cmd.navi-tech.in/medici/litmus/pull/33#discussion_r95054 --- .../java/com/navi/medici/controller/v1/MetricController.java | 4 ++-- .../java/com/navi/medici/request/CreateMetricRequest.java | 1 - .../com/navi/medici/service/metric/MetricServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/litmus-core/src/main/java/com/navi/medici/controller/v1/MetricController.java b/litmus-core/src/main/java/com/navi/medici/controller/v1/MetricController.java index 45b29f5..34c9855 100644 --- a/litmus-core/src/main/java/com/navi/medici/controller/v1/MetricController.java +++ b/litmus-core/src/main/java/com/navi/medici/controller/v1/MetricController.java @@ -22,8 +22,8 @@ public class MetricController { @PostMapping @Timed(value = "litmus.create.metric", percentiles = {0.95, 0.99}) - public ResponseEntity createMetric(@RequestBody CreateMetricRequest createMetricRequest, @RequestHeader("x-session-token") String sessionToken){ + public ResponseEntity createMetric(@RequestBody CreateMetricRequest createMetricRequest, @RequestHeader("x-email-id") String emailId){ log.info("create request received for creating metric : {}", createMetricRequest.getMetricName()); - return ResponseEntity.ok(metricService.createMetric(createMetricRequest,sessionToken)); + return ResponseEntity.ok(metricService.createMetric(createMetricRequest,emailId)); } } diff --git a/litmus-core/src/main/java/com/navi/medici/request/CreateMetricRequest.java b/litmus-core/src/main/java/com/navi/medici/request/CreateMetricRequest.java index f855bb0..c0e3daf 100644 --- a/litmus-core/src/main/java/com/navi/medici/request/CreateMetricRequest.java +++ b/litmus-core/src/main/java/com/navi/medici/request/CreateMetricRequest.java @@ -17,5 +17,4 @@ public class CreateMetricRequest { String metricName; String athenaQuery; MetricType metricType; - String createdBy; } diff --git a/litmus-core/src/main/java/com/navi/medici/service/metric/MetricServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/metric/MetricServiceImpl.java index f515920..84145b8 100644 --- a/litmus-core/src/main/java/com/navi/medici/service/metric/MetricServiceImpl.java +++ b/litmus-core/src/main/java/com/navi/medici/service/metric/MetricServiceImpl.java @@ -24,13 +24,13 @@ public class MetricServiceImpl implements MetricService { private final JacksonUtils jacksonUtils; private final MetricValidator metricRequestValidator; @Override - public MetricResponse createMetric(CreateMetricRequest createMetricRequest, String sessionToken) { + public MetricResponse createMetric(CreateMetricRequest createMetricRequest, String emailId) { metricRequestValidator.validateCreateMetricRequest(createMetricRequest); MetricEntity metric = MetricEntity.builder() .metricId(UUID.randomUUID().toString()) .metricName(createMetricRequest.getMetricName()) .metricType(jacksonUtils.objectToString(createMetricRequest.getMetricType())) - .createdBy(createMetricRequest.getCreatedBy()) + .createdBy(emailId) .athenaQuery(createMetricRequest.getAthenaQuery()) .build(); return metricMapper.mapMetricEntityToMetricResponse(metricRepository.save(metric));