Added React.Lazy

heimdall-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>br.com.conductor.heimdall</groupId>
 		<artifactId>heimdall</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>heimdall-api</artifactId>
 	<name>heimdall-api</name>

heimdall-api/src/test/java/br/com/conductor/heimdall/api/resource/AccessTokenResourceTest.java

@@ -74,15 +74,37 @@ public void setupTest() {
 
      @Test
      @WithMockUser(username="tester", authorities={"CREATE_ACCESSTOKEN"})
-     public void testSavingAccessTokenWithoutRequiredField() throws Exception {
+     public void testSavingAccessTokenWithoutApp() throws Exception {
 
           mockMvc.perform(MockMvcRequestBuilders.post(ConstantsPath.PATH_ACCESS_TOKENS, 10L)
-                 .content("{\"code\":\"!!@!##1212\"}")
-                 .contentType(MediaType.APPLICATION_JSON))
+                                                .content("{\"code\":\"!!@!##1212\", \"plans\": [{\"id\": 5}]}")
+                                                .contentType(MediaType.APPLICATION_JSON))
                  .andExpect(MockMvcResultMatchers.status().is4xxClientError())
                  .andExpect(MockMvcResultMatchers.content().json("{\"status\":400,\"exception\":\"MethodArgumentNotValidException\",\"erros\":[{\"defaultMessage\":\"may not be null\",\"field\":\"app\",\"code\":\"NotNull\"}]}"));
      }
 
+     @Test
+     @WithMockUser(username="tester", authorities={"CREATE_ACCESSTOKEN"})
+     public void testSavingAccessTokenWithEmptyPlans() throws Exception {
+
+          mockMvc.perform(MockMvcRequestBuilders.post(ConstantsPath.PATH_ACCESS_TOKENS, 10L)
+                                                .content("{\"code\":\"!!@!##1212\", \"app\":{\"id\":10}, \"plans\": [] }")
+                                                .contentType(MediaType.APPLICATION_JSON))
+                 .andExpect(MockMvcResultMatchers.status().is4xxClientError())
+                 .andExpect(MockMvcResultMatchers.content().json("{\"status\":400,\"exception\":\"MethodArgumentNotValidException\",\"erros\":[{\"defaultMessage\":\"size must be between 1 and 2147483647\",\"field\":\"plans\",\"code\":\"Size\"}]}"));
+     }
+
+     @Test
+     @WithMockUser(username="tester", authorities={"CREATE_ACCESSTOKEN"})
+     public void testSavingAccessTokenWithoutPlans() throws Exception {
+
+          mockMvc.perform(MockMvcRequestBuilders.post(ConstantsPath.PATH_ACCESS_TOKENS, 10L)
+                                                .content("{\"code\":\"!!@!##1212\", \"app\":{\"id\":10}}")
+                                                .contentType(MediaType.APPLICATION_JSON))
+                 .andExpect(MockMvcResultMatchers.status().is4xxClientError())
+                 .andExpect(MockMvcResultMatchers.content().json("{\"status\":400,\"exception\":\"MethodArgumentNotValidException\",\"erros\":[{\"defaultMessage\":\"may not be null\",\"field\":\"plans\",\"code\":\"NotNull\"}]}"));
+     }
+
      @Test
      @WithMockUser(username="tester", authorities={"CREATE_ACCESSTOKEN"})
      public void testSavingAccessTokenWithoutDefaultValues() throws Exception {
@@ -93,7 +115,7 @@ public void testSavingAccessTokenWithoutDefaultValues() throws Exception {
           Mockito.when(service.save(Mockito.any(AccessTokenPersist.class))).thenReturn(recoverAt);
 
           mockMvc.perform(MockMvcRequestBuilders.post(ConstantsPath.PATH_ACCESS_TOKENS, 10L)
-                 .content("{\"code\":\"!!@!##1212\",\"app\":{\"id\":10}}")
+                 .content("{\"code\":\"!!@!##1212\",\"app\":{\"id\":10}, \"plans\": [{\"id\": 5}]}")
                  .contentType(MediaType.APPLICATION_JSON))
                  .andExpect(MockMvcResultMatchers.status().isCreated());
      }

heimdall-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>br.com.conductor.heimdall</groupId>
 		<artifactId>heimdall</artifactId>
-		<version>2.3.2-SNAPSHOT</version>
+		<version>2.4.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>heimdall-core</artifactId>

heimdall-core/src/main/java/br/com/conductor/heimdall/core/dto/AppDTO.java

@@ -56,5 +56,7 @@ public class AppDTO implements Serializable {
 
      private Status status;
 
+     @NotNull
+     @Size(min = 1)
      private List<ReferenceIdDTO> plans;
 }

heimdall-core/src/main/java/br/com/conductor/heimdall/core/dto/persist/AccessTokenPersist.java

@@ -52,6 +52,8 @@ public class AccessTokenPersist implements Serializable {
 
      private LocalDateTime expiredDate;
 
+     @NotNull
+     @Size(min = 1)
      private List<ReferenceIdDTO> plans;
 
      private Status status;

heimdall-core/src/main/java/br/com/conductor/heimdall/core/dto/persist/AppPersist.java

@@ -56,6 +56,8 @@ public class AppPersist implements Serializable {
 
     private Status status;
 
+    @NotNull
+    @Size(min = 1)
     private List<ReferenceIdDTO> plans;
 
     private String clientId;

heimdall-core/src/main/java/br/com/conductor/heimdall/core/entity/AccessToken.java

@@ -103,6 +103,7 @@ private void initValuesPersist() {
           status = (status == null) ? Status.ACTIVE : status;
 
           creationDate = LocalDateTime.now();
+          code = code.trim();
      }
 
 }

heimdall-core/src/main/java/br/com/conductor/heimdall/core/entity/App.java

@@ -101,6 +101,7 @@ private void initValuesPersist() {
         status = (status == null) ? Status.ACTIVE : status;
 
         creationDate = LocalDateTime.now();
+        clientId = clientId.trim();
     }
 
 

heimdall-core/src/main/java/br/com/conductor/heimdall/core/entity/Plan.java

@@ -27,6 +27,7 @@
 
 import javax.persistence.*;
 
+import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -67,6 +68,7 @@ public class Plan implements Serializable {
      @ManyToOne
      @JoinColumn(name = "API_ID", nullable = false)
      @JsonIgnoreProperties({ "environments" })
+     @ToString.Exclude
      private Api api;
 
      @Column(name = "CREATION_DATE", nullable = false, updatable=false)

heimdall-core/src/main/java/br/com/conductor/heimdall/core/exception/ExceptionMessage.java

@@ -112,6 +112,8 @@ public enum ExceptionMessage {
 
     ENVIRONMENT_ATTACHED_TO_API(BAD_REQUEST.value(), "Environment attached to Api", BadRequestException.class),
 
+    PLAN_ATTACHED_TO_APPS(BAD_REQUEST.value(), "Plan attached to App", BadRequestException.class),
+
     ENVIRONMENT_INBOUND_DNS_PATTERN(BAD_REQUEST.value(), "Environment inbound URL has to follow the pattern http[s]://host.domain[:port] or www.host.domain[:port]", BadRequestException.class),
 
     PROVIDER_NOT_FOUND(BAD_REQUEST.value(), "Provider not found", BadRequestException.class),

heimdall-core/src/main/java/br/com/conductor/heimdall/core/repository/MiddlewareRepository.java

@@ -24,6 +24,9 @@
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import br.com.conductor.heimdall.core.entity.Middleware;
 import br.com.conductor.heimdall.core.enums.Status;
@@ -95,5 +98,13 @@ public interface MiddlewareRepository extends JpaRepository<Middleware, Long> {
       * @return				The Middleware found
 	  */
      Middleware findTop1ByApiIdOrderByVersionDesc(Long apiId);
+
+	/**
+	 * 
+	 * @param id interceptor id
+	 */
+	@Modifying
+	@Query(value = "DELETE FROM MIDDLEWARES_INTERCEPTORS WHERE INTERCEPTOR_ID = :ID", nativeQuery = true)
+	void detachFromInterceptor(@Param("ID") Long id);
 
 }

heimdall-core/src/main/java/br/com/conductor/heimdall/core/repository/PlanRepository.java

@@ -24,6 +24,8 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import br.com.conductor.heimdall.core.entity.Plan;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 /**
  * Plan Repository.
@@ -33,4 +35,13 @@
  */
 public interface PlanRepository extends JpaRepository<Plan, Long> {
 
+     /**
+      * Check if a plan has apps attached
+      *
+      * @param id
+      * @return
+      */
+     @Query(value = "select count(0) from apps_plans where plan_id = :id", nativeQuery = true)
+     Integer findAppsWithPlan(@Param("id") Long id);
+
 }

heimdall-core/src/main/java/br/com/conductor/heimdall/core/service/AppService.java

@@ -22,13 +22,17 @@
  */
 
 import static br.com.conductor.heimdall.core.exception.ExceptionMessage.*;
+import static br.com.twsoftware.alfred.object.Objeto.isBlank;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
+import br.com.conductor.heimdall.core.dto.ReferenceIdDTO;
 import br.com.conductor.heimdall.core.dto.persist.AppPersist;
+import br.com.conductor.heimdall.core.entity.AccessToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
@@ -37,9 +41,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.google.common.collect.Lists;
 
-//import br.com.conductor.heimdall.core.converter.AppMap;
 import br.com.conductor.heimdall.core.converter.GenericConverter;
 import br.com.conductor.heimdall.core.dto.AppDTO;
 import br.com.conductor.heimdall.core.dto.PageDTO;
@@ -184,7 +186,9 @@ public App save(AppPersist appDTO) {
      public App update(Long id, AppDTO appDTO) {
 
           App app = appRepository.findOne(id);
-          HeimdallException.checkThrow(app == null, GLOBAL_RESOURCE_NOT_FOUND);
+          HeimdallException.checkThrow(isBlank(app), GLOBAL_RESOURCE_NOT_FOUND);
+
+          updateTokensPlansByApp(id, appDTO.getPlans().stream().map(ReferenceIdDTO::getId).collect(Collectors.toList()));
 
           app.setAccessTokens(accessTokenRepository.findByAppId(app.getId()));
           app = GenericConverter.mapper(appDTO, app);
@@ -195,6 +199,26 @@ public App update(Long id, AppDTO appDTO) {
           return app;
      }
 
+     /**
+      * Updates app's access tokens.
+      * This is used for removing the access token to plan association, only if an app removes one of it's plans. 
+      * 
+      * @param appId The ID of the {@link App}
+      * @param plansIds List of {@link Plan}'s IDs 
+      */
+     private void updateTokensPlansByApp(Long appId, List<Long> plansIds) {
+          List<AccessToken> accessTokenList = accessTokenRepository.findByAppId(appId);
+          if (Objects.nonNull(accessTokenList)) {
+               accessTokenList.forEach(accessToken -> {
+                    if (Objects.nonNull(accessToken.getPlans()) && !accessToken.getPlans().isEmpty()) {
+                         List<Plan> planList = accessToken.getPlans().stream().filter(plan -> plansIds.contains(plan.getId())).collect(Collectors.toList());
+                         accessToken.setPlans(planList);
+                         accessTokenRepository.save(accessToken);
+                    }
+               });
+          }
+     }
+
      /**
       * Deletes a {@link App} by its ID.
       * 

heimdall-core/src/main/java/br/com/conductor/heimdall/core/service/InterceptorService.java

@@ -275,6 +275,7 @@ public void delete(Long id) {
 
             String api = interceptor.getOperation().getResource().getApi().getId().toString();
             pathName = String.join("/", zuulFilterRoot, MIDDLEWARE_API_ROOT, api, fileName);
+            middlewareRepository.detachFromInterceptor(id);
         }
 
         if (TypeInterceptor.CORS.equals(interceptor.getType())) {

heimdall-core/src/main/java/br/com/conductor/heimdall/core/service/PlanService.java

@@ -23,6 +23,7 @@
 
 import static br.com.conductor.heimdall.core.exception.ExceptionMessage.DEFAULT_PLAN_ALREADY_EXIST_TO_THIS_API;
 import static br.com.conductor.heimdall.core.exception.ExceptionMessage.GLOBAL_RESOURCE_NOT_FOUND;
+import static br.com.conductor.heimdall.core.exception.ExceptionMessage.PLAN_ATTACHED_TO_APPS;
 
 import java.util.List;
 
@@ -173,6 +174,9 @@ public void delete(Long id) {
           Plan plan = planRepository.findOne(id);
           HeimdallException.checkThrow(plan == null, GLOBAL_RESOURCE_NOT_FOUND);
 
+          Integer totalAppsAttached = planRepository.findAppsWithPlan(id);
+          HeimdallException.checkThrow(totalAppsAttached > 0, PLAN_ATTACHED_TO_APPS);
+
           planRepository.delete(plan);
 
           amqpCacheService.dispatchClean();

heimdall-core/src/test/java/br/com/conductor/heimdall/core/service/AppServiceTest.java

@@ -20,14 +20,19 @@
  * ==========================LICENSE_END===================================
  */
 
+import br.com.conductor.heimdall.core.dto.AppDTO;
 import br.com.conductor.heimdall.core.dto.ReferenceIdDTO;
 import br.com.conductor.heimdall.core.dto.persist.AppPersist;
+import br.com.conductor.heimdall.core.entity.AccessToken;
 import br.com.conductor.heimdall.core.entity.App;
 import br.com.conductor.heimdall.core.entity.Developer;
+import br.com.conductor.heimdall.core.entity.Plan;
 import br.com.conductor.heimdall.core.exception.BadRequestException;
+import br.com.conductor.heimdall.core.repository.AccessTokenRepository;
 import br.com.conductor.heimdall.core.repository.AppRepository;
 import br.com.conductor.heimdall.core.repository.DeveloperRepository;
 import br.com.conductor.heimdall.core.service.amqp.AMQPCacheService;
+import com.google.common.collect.Lists;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -39,6 +44,9 @@
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author <a href="https://dijalmasilva.github.io" target="_blank">Dijalma Silva</a>
  */
@@ -56,6 +64,9 @@ public class AppServiceTest {
 
     @Mock
     private AMQPCacheService amqpCacheService;
+
+    @Mock
+    private AccessTokenRepository accessTokenRepository;
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -64,6 +75,8 @@ public class AppServiceTest {
     private App app1;
     private Developer developer;
     private AppPersist appPersist;
+    private AppDTO appDTO;
+    private List<ReferenceIdDTO> referenceIdDTOList = Lists.newArrayList(new ReferenceIdDTO(0L));
 
     @Before
     public void initAttributes() {
@@ -84,6 +97,10 @@ public void initAttributes() {
         appPersist.setName("App test");
         appPersist.setDescription("App test description");
         appPersist.setDeveloper(new ReferenceIdDTO(1L));
+
+        appDTO = new AppDTO();
+        appDTO.setName("App name");
+        appDTO.setDeveloper(new ReferenceIdDTO(1l));
     }
 
     @Test
@@ -129,4 +146,58 @@ public void testSaveWithCodeIsAlready() {
 
         this.appService.save(appPersist);
     }
+
+    @Test
+    public void testUpdateHavingPlans() {
+        Mockito.when(appRepository.findOne(Mockito.anyLong())).thenReturn(app);
+        Mockito.when(appRepository.save(Mockito.any(App.class))).thenReturn(app);
+        Mockito.when(accessTokenRepository.findByAppId(Mockito.anyLong())).thenReturn(Lists.newArrayList(getAccessToken(Lists.newArrayList(getPlan()))));
+
+        appDTO.setPlans(referenceIdDTOList);
+
+        this.appService.update(0L, appDTO);
+        Mockito.verify(accessTokenRepository, Mockito.times(2)).findByAppId(Mockito.anyLong());
+        Mockito.verify(accessTokenRepository, Mockito.times(1)).save(Mockito.any(AccessToken.class));
+    }
+
+
+    @Test
+    public void testUpdateHavingNoAccessToken() {
+        Mockito.when(appRepository.findOne(Mockito.anyLong())).thenReturn(app);
+        Mockito.when(appRepository.save(Mockito.any(App.class))).thenReturn(app);
+        Mockito.when(accessTokenRepository.findByAppId(Mockito.anyLong())).thenReturn(null);
+
+        appDTO.setPlans(referenceIdDTOList);
+
+        this.appService.update(0L, appDTO);
+        Mockito.verify(accessTokenRepository, Mockito.times(0)).save(Mockito.any(AccessToken.class));
+    }
+
+    @Test
+    public void testUpdateHavingEmptyAccessToken() {
+        Mockito.when(appRepository.findOne(Mockito.anyLong())).thenReturn(app);
+        Mockito.when(appRepository.save(Mockito.any(App.class))).thenReturn(app);
+        Mockito.when(accessTokenRepository.findByAppId(Mockito.anyLong())).thenReturn(new ArrayList<>());
+
+        appDTO.setPlans(referenceIdDTOList);
+
+        this.appService.update(0L, appDTO);
+        Mockito.verify(accessTokenRepository, Mockito.times(0)).save(Mockito.any(AccessToken.class));
+    }
+
+
+    private Plan getPlan() {
+
+        Plan plan = new Plan();
+        plan.setId(1l);
+        return plan;
+    }
+
+    private AccessToken getAccessToken(List<Plan> plans) {
+
+        AccessToken accessToken = new AccessToken();
+        accessToken.setPlans(plans);
+        accessToken.setId(0L);
+        return accessToken;
+    }
 }