diff --git a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java index 47adbf3..c480d4a 100644 --- a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java +++ b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java @@ -100,7 +100,7 @@ public class ExperimentServiceImpl implements ExperimentService { .experiment(experiment) .experimentMetadata(experimentMetadata) .testUsers(0L) - .experimentStatus(ExperimentStatus.CREATED) + .experimentStatus(ExperimentStatus.RUNNING) .team(team.orElse(null)) .build(); experimentInfoQuery.save(experimentInfo); diff --git a/litmus-core/src/main/java/com/navi/medici/service/segment/SegmentServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/segment/SegmentServiceImpl.java index 93a5763..3b65fff 100644 --- a/litmus-core/src/main/java/com/navi/medici/service/segment/SegmentServiceImpl.java +++ b/litmus-core/src/main/java/com/navi/medici/service/segment/SegmentServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.transaction.Transactional; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -133,6 +134,7 @@ public class SegmentServiceImpl implements SegmentService { } @Override + @Transactional public SegmentResponse createSegment(CreateSegmentRequest request, String emailId) { segmentValidator.validateCreateSegmentRequest(request); String destinationBucketName = UUID.randomUUID().toString(); diff --git a/litmus-core/src/main/java/com/navi/medici/service/team/TeamServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/team/TeamServiceImpl.java index 9564825..69a3845 100644 --- a/litmus-core/src/main/java/com/navi/medici/service/team/TeamServiceImpl.java +++ b/litmus-core/src/main/java/com/navi/medici/service/team/TeamServiceImpl.java @@ -44,11 +44,17 @@ public class TeamServiceImpl implements TeamService { @Override public List getTeamsDropdown() { List teamEntities = teamQuery.findAll(); - return teamEntities.stream() + List teamDropdown = teamEntities.stream() .map(team -> Dropdown.builder() .label(team.getTeamName()) .value(team.getTeamName()) .build()) .collect(Collectors.toList()); + Dropdown allDropdown = Dropdown.builder() + .label("All") + .value("ALL") + .build(); + teamDropdown.add(0, allDropdown); + return teamDropdown; } } diff --git a/litmus-core/src/main/java/com/navi/medici/specification/MetricSpecification.java b/litmus-core/src/main/java/com/navi/medici/specification/MetricSpecification.java index 88f8b76..03cee5f 100644 --- a/litmus-core/src/main/java/com/navi/medici/specification/MetricSpecification.java +++ b/litmus-core/src/main/java/com/navi/medici/specification/MetricSpecification.java @@ -30,7 +30,7 @@ public class MetricSpecification { predicateList.add( cb.equal( root.get("metricType"), - String.valueOf(value) + value ) ); }); diff --git a/litmus-core/src/test/java/com/navi/medici/service/team/TeamServiceImplTest.java b/litmus-core/src/test/java/com/navi/medici/service/team/TeamServiceImplTest.java index a8fbabe..4f82f0c 100644 --- a/litmus-core/src/test/java/com/navi/medici/service/team/TeamServiceImplTest.java +++ b/litmus-core/src/test/java/com/navi/medici/service/team/TeamServiceImplTest.java @@ -55,7 +55,7 @@ class TeamServiceImplTest { TeamEntity team = TestUtils.getTeamEntity(); Mockito.when(teamQuery.findAll()).thenReturn(List.of(team)); List dropdowns = teamService.getTeamsDropdown(); - assertEquals("test team", dropdowns.get(0).getValue()); - assertEquals("test team", dropdowns.get(0).getLabel()); + assertEquals("test team", dropdowns.get(1).getValue()); + assertEquals("test team", dropdowns.get(1).getLabel()); } } \ No newline at end of file diff --git a/litmus-core/src/test/java/com/navi/medici/specification/MetricSpecificationTest.java b/litmus-core/src/test/java/com/navi/medici/specification/MetricSpecificationTest.java index b7355a7..3ecef0a 100644 --- a/litmus-core/src/test/java/com/navi/medici/specification/MetricSpecificationTest.java +++ b/litmus-core/src/test/java/com/navi/medici/specification/MetricSpecificationTest.java @@ -44,7 +44,7 @@ class MetricSpecificationTest { Mockito.when(metricEntityRootMock.get(any(String.class))).thenReturn(mockPath); Mockito.when(criteriaBuilderMock.lower(mockPath)).thenReturn(mockExpression); Mockito.when(criteriaBuilderMock.like(mockExpression, "%" + request.getQuery() + "%")).thenReturn(mockPredicate); - Mockito.when(criteriaBuilderMock.equal(mockPath, String.valueOf(request.getType()))).thenReturn(mockPredicate); + Mockito.when(criteriaBuilderMock.equal(mockPath, request.getType())).thenReturn(mockPredicate); Mockito.when(criteriaBuilderMock.desc(mockPath)).thenReturn(mockOrder); Mockito.when(criteriaQueryMock.orderBy(mockOrder)).thenReturn(criteriaQueryMock); Mockito.when(criteriaBuilderMock.and(any())).thenReturn(mockPredicate);