Commit 652151ac authored by Noel Alonso's avatar Noel Alonso
Browse files

Mejora filtrado de resultados de worms

parent 0f6e7adb

src/main/java/es/redmic/es/administrative/taxonomy/service/WormsToRedmicService.java

+10 −3
Original line number Diff line number Diff line 
package es.redmic.es.administrative.taxonomy.service;



import java.util.ArrayList;

import java.util.List;



import javax.annotation.PostConstruct;
@@ -53,6 +54,8 @@ public class WormsToRedmicService { 


	private List<RankDTO> ranks;



	private List<String> speciesRankLabel = new ArrayList<>();



	private final Logger LOGGER = LoggerFactory.getLogger(WormsToRedmicService.class);



	public WormsToRedmicService() {
@@ -62,6 +65,12 @@ public class WormsToRedmicService { 
	@PostConstruct

	private void init() {

		ranks = rankESService.getRankClassification();



		for (RankDTO rank : ranks) {

			if (rank.getId() >= 10) {

				speciesRankLabel.add(rank.getName_en());

			}

		}

	}



	/*
@@ -375,9 +384,7 @@ public class WormsToRedmicService { 


		for (WormsDTO dto : wormsList) {



			RankDTO rank = orikaMapper.getMapperFacade().map(rankESService.findByName_en(dto.getRank()), RankDTO.class);



			if (rank.getId() >= 10) {

			if (speciesRankLabel.contains(dto.getRank())) {

				result.add(dto);

			}

		}

src/test/java/es/redmic/test/unit/utils/WormsRestClientTest.java

+4 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



import org.joda.time.DateTime;
@@ -84,6 +85,9 @@ public class WormsRestClientTest extends JsonToBeanTestUtil { 


		Whitebox.setInternalState(service, "ranks", getRanks());



		Whitebox.setInternalState(service, "speciesRankLabel",

				new ArrayList<String>(Arrays.asList("Species", "Subspecies", "Variety")));



		DomainES kingdom = new DomainES();

		kingdom.setName_en("kingdom");

		when(taxonRankESService.findByName_en(anyString())).thenReturn(kingdom);
@@ -122,10 +126,6 @@ public class WormsRestClientTest extends JsonToBeanTestUtil { 
	@Test

	public void getAphiaRecordsByName_ReturnRecords_IfRequestIsCorrect() throws Exception {



		DomainES species = new DomainES();

		species.setId(10L);

		when(taxonRankESService.findByName_en("Species")).thenReturn(species);



		WormsListDTO result = service.findAphiaRecordsByScientificName("Leptochelia dubia");



		assertNotNull(result);