Gp19 151 esc read new

SpringProject/MainApplication/src/it/java/com/gradproject2019/ElasticsearchIT.java

@@ -0,0 +1,141 @@
+package com.gradproject2019;
+
+import gradproject2019.conferences.data.ConferenceResponseDto;
+import gradproject2019.conferences.service.ConferenceService;
+import gradproject2019.elasticsearch.persistence.EsConference;
+import gradproject2019.elasticsearch.repository.ConferenceSearchRepository;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ElasticsearchIT {
+
+    @LocalServerPort
+    int testServerPort;
+    private String baseUri;
+
+    @Before
+    public void setUp() {
+        baseUri = "http://localhost:" + testServerPort + "/conferences";
+    }
+
+    @Autowired
+    public TestRestTemplate restTemplate;
+
+    @Autowired
+    private ConferenceService conferenceService;
+
+    @Autowired
+    ConferenceSearchRepository repository;
+
+//    @Autowired
+//    ElasticsearchTemplate template;
+
+//    @Test
+//    public void shouldSaveEsConferenceToSearchRepository() {
+//        EsConference esConference = new EsConference();
+//        esConference.setId(1L);
+//        esConference.setName("SophiaCon");
+//        //esConference.setDateTime(Instant.now());
+//        esConference.setCity("London");
+//        esConference.setDescription("A conference");
+//        esConference.setTopic("Sophia");
+//
+//        EsConference savedConference = repository.save(esConference);
+//
+//        assertThat(savedConference).isSameAs(esConference);
+//    }
+//
+//    @Test
+//    public void testFindAll() {
+//        Iterable<EsConference> esConference = repository.findAll();
+//        Assert.assertTrue(esConference.iterator().hasNext());
+//    }
+//
+//    @Test
+//    public void testFindByTopic() {
+//        Page<EsConference> esConference = repository.findByTopic("Sophia", PageRequest.of(1, 1));
+//        Assert.assertTrue(esConference.getTotalPages() > 0);
+//
+//    }
+//
+//    @Test
+//    public void shouldReturn200AndEmptyListWhenNoConferences() throws URISyntaxException {
+//        URI uri = new URI(baseUri);
+//
+//        ResponseEntity<List<ConferenceResponseDto>> response = getConferenceList(uri);
+//
+//        Assert.assertEquals(200, response.getStatusCodeValue());
+//        Assert.assertEquals(true, response.getBody().isEmpty());
+//    }
+//
+//    @Test
+//    public void shouldReturn200AndListOfConferencesWhenConferenceExists() throws URISyntaxException {
+//        URI uri = new URI(baseUri);
+//        Conference addedConference = conferenceRepository.saveAndFlush(conference);
+//
+//        ResponseEntity<List<ConferenceResponseDto>> response = getConferenceList(uri);
+//
+//        Assert.assertEquals(200, response.getStatusCodeValue());
+//        Assert.assertEquals(conference.getName(), response.getBody().get(0).getName());
+//        Assert.assertEquals(addedConference.getId(),response.getBody().get(0).getId());
+//    }
+
+    @Test
+    public void testFindByTopic() throws URISyntaxException {
+        EsConference esConference = new EsConference();
+        esConference.setId(1L);
+        esConference.setName("SophiaCon");
+        //esConference.setDateTime(Instant.now());
+        esConference.setCity("London");
+        esConference.setDescription("A conference");
+        esConference.setTopic("Sophia");
+
+        EsConference esConference2 = new EsConference();
+        esConference2.setId(2L);
+        esConference2.setName("SophiaCon2");
+        //esConference.setDateTime(Instant.now());
+        esConference2.setCity("London2");
+        esConference2.setDescription("A conference2");
+        esConference2.setTopic("Sophia2");
+
+
+        restTemplate.getRestTemplate().setRequestFactory(new HttpComponentsClientHttpRequestFactory());
+
+        EsConference savedConference = repository.save(esConference);
+        //EsConference savedConference2 = repository.save(esConference2);
+        URI uri = new URI(baseUri + "?topic=Sophia&page=1&size=10");
+        //URI uri2 = new URI(baseUri );
+
+
+        //List<ConferenceResponseDto> conferences = conferenceService.findByConferenceTopic("Sophia", 1, 1);
+
+        ResponseEntity<ConferenceResponseDto> response = getEsConferenceList(uri);
+
+        Assert.assertNotNull(response);
+        Assert.assertEquals(200, response.getStatusCodeValue());
+        //Assert.assertEquals(1, response.size());
+        //Assert.assertEquals(esConference.getName(), response.getBody().get(0).getName());
+    }
+
+    private ResponseEntity<ConferenceResponseDto> getEsConferenceList(URI uri) {
+        return restTemplate.exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference<ConferenceResponseDto>() {});
+    }
+
+}
+

SpringProject/MainApplication/src/it/java/com/gradproject2019/auth/AuthControllerIT.java

@@ -1,7 +1,7 @@
 package com.gradproject2019.auth;
 
-import com.gradproject2019.auth.data.LoginDto;
-import com.gradproject2019.auth.persistence.Token;
+import gradproject2019.auth.data.LoginDto;
+import gradproject2019.auth.persistence.Token;
 import com.gradproject2019.utils.ErrorEntity;
 import com.gradproject2019.utils.TestUtils;
 import org.junit.After;

SpringProject/MainApplication/src/it/java/com/gradproject2019/conferences/ConferenceControllerIT.java

@@ -1,9 +1,9 @@
 package com.gradproject2019.conferences;
 
-import com.gradproject2019.conferences.data.ConferencePatchRequestDto;
-import com.gradproject2019.conferences.data.ConferenceRequestDto;
-import com.gradproject2019.conferences.data.ConferenceResponseDto;
-import com.gradproject2019.conferences.persistence.Conference;
+import gradproject2019.conferences.data.ConferencePatchRequestDto;
+import gradproject2019.conferences.data.ConferenceRequestDto;
+import gradproject2019.conferences.data.ConferenceResponseDto;
+import gradproject2019.conferences.persistence.Conference;
 import com.gradproject2019.utils.ErrorEntity;
 import com.gradproject2019.utils.TestUtils;
 import org.junit.After;

SpringProject/MainApplication/src/it/java/com/gradproject2019/user/UserControllerIT.java

@@ -1,10 +1,10 @@
 package com.gradproject2019.user;
 
-import com.gradproject2019.auth.persistence.Token;
-import com.gradproject2019.users.data.UserPatchRequestDto;
-import com.gradproject2019.users.data.UserRequestDto;
-import com.gradproject2019.users.data.UserResponseDto;
-import com.gradproject2019.users.persistence.User;
+import gradproject2019.auth.persistence.Token;
+import gradproject2019.users.data.UserPatchRequestDto;
+import gradproject2019.users.data.UserRequestDto;
+import gradproject2019.users.data.UserResponseDto;
+import gradproject2019.users.persistence.User;
 import com.gradproject2019.utils.ErrorEntity;
 import com.gradproject2019.utils.TestUtils;
 import org.junit.After;

SpringProject/MainApplication/src/it/java/com/gradproject2019/userConference/UserConferenceControllerIT.java

@@ -1,9 +1,9 @@
 package com.gradproject2019.userConference;
 
-import com.gradproject2019.conferences.data.ConferenceResponseDto;
-import com.gradproject2019.userConference.data.UserConferenceRequestDto;
-import com.gradproject2019.userConference.data.UserConferenceResponseDto;
-import com.gradproject2019.userConference.persistence.UserConference;
+import gradproject2019.conferences.data.ConferenceResponseDto;
+import gradproject2019.userConference.data.UserConferenceRequestDto;
+import gradproject2019.userConference.data.UserConferenceResponseDto;
+import gradproject2019.userConference.persistence.UserConference;
 import com.gradproject2019.utils.ErrorEntity;
 import com.gradproject2019.utils.TestUtils;
 import org.junit.After;
@@ -22,7 +22,7 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
-import static com.gradproject2019.userConference.data.UserConferenceRequestDto.UserConferenceRequestDtoBuilder.anUserConferenceRequestDto;
+import static gradproject2019.userConference.data.UserConferenceRequestDto.UserConferenceRequestDtoBuilder.anUserConferenceRequestDto;
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 

SpringProject/MainApplication/src/it/java/com/gradproject2019/utils/TestUtils.java

@@ -1,15 +1,16 @@
 package com.gradproject2019.utils;
 
-import com.gradproject2019.auth.persistence.Token;
-import com.gradproject2019.auth.repository.AuthRepository;
-import com.gradproject2019.auth.service.AuthService;
-import com.gradproject2019.conferences.persistence.Conference;
-import com.gradproject2019.conferences.repository.ConferenceRepository;
-import com.gradproject2019.userConference.persistence.UserConference;
-import com.gradproject2019.userConference.repository.UserConferenceRepository;
-import com.gradproject2019.userConference.service.UserConferenceService;
-import com.gradproject2019.users.persistence.User;
-import com.gradproject2019.users.repository.UserRepository;
+import gradproject2019.auth.persistence.Token;
+import gradproject2019.auth.repository.AuthRepository;
+import gradproject2019.auth.service.AuthService;
+import gradproject2019.conferences.persistence.Conference;
+import gradproject2019.conferences.repository.ConferenceRepository;
+import gradproject2019.userConference.persistence.UserConference;
+import gradproject2019.userConference.repository.UserConferenceRepository;
+import gradproject2019.userConference.service.UserConferenceService;
+import gradproject2019.users.persistence.User;
+import gradproject2019.users.repository.UserRepository;
+import gradproject2019.utils.AuthUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpHeaders;

SpringProject/MainApplication/src/main/curl/Index.json

@@ -0,0 +1,44 @@
+ {
+    "settings": {
+        "index": {
+            "number_of_shards": 3,
+            "number_of_replicas": 2
+        },
+        "analysis": {
+            "normalizer": {
+                "standard_lowercase": {
+                    "type": "custom",
+                    "filter": ["lowercase"]
+                }
+            }
+        }
+    },
+    "mappings": {
+        "properties": {
+            "name": {
+                "type": "text"
+            },
+            "city": {
+                "type": "keyword"
+            },
+            "description": {
+                "type": "text"
+            },
+            "topic": {
+                "type": "text",
+                "analyser": "simple",
+                "fields": {
+                    "keyword":{
+                        "type": "keyword",
+                        "normalizer": "standard_lowercase"
+                    }
+                }
+            },
+            "dateTime": {
+                "type": "date"
+            }
+        }
+    }
+}
+
+

SpringProject/MainApplication/src/main/curl/Index.sh

@@ -0,0 +1 @@
+curl -X PUT "http://localhost:9200/mock_conferences" -H "Content-Type: application/json" --data-binary @index.json

SpringProject/MainApplication/src/main/curl/MockConferences.json

@@ -0,0 +1,22 @@
+[
+  {
+    "name": "Sophia's Conference",
+    "city": "London",
+    "description": "A conference about Sophia",
+    "topic": "People"
+  },
+
+  {
+    "name": "Grace's Conference",
+    "city": "Sheffield",
+    "description": "All about why Sheffield is the best city in the world",
+    "topic": "Travel"
+  },
+
+  {
+    "name": "Karen's Conference",
+    "city": "Rome",
+    "description": "Its-a conference about-a pasta",
+    "topic": "Food"
+  }
+]

SpringProject/MainApplication/src/main/java/gradproject2019/conferences/controller/ConferenceController.java

@@ -3,6 +3,7 @@
 import gradproject2019.conferences.data.ConferencePatchRequestDto;
 import gradproject2019.conferences.data.ConferenceRequestDto;
 import gradproject2019.conferences.data.ConferenceResponseDto;
+
 import gradproject2019.conferences.service.ConferenceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -13,6 +14,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import static org.hibernate.annotations.common.util.StringHelper.isNotEmpty;
+
 @CrossOrigin(origins = "http://localhost:3000")
 @Controller
 @RequestMapping("/conferences")
@@ -22,8 +25,32 @@ public class ConferenceController {
     private ConferenceService conferenceService;
 
     @GetMapping
-    public ResponseEntity<List<ConferenceResponseDto>> getAllConferences() {
-        List<ConferenceResponseDto> conferences = conferenceService.getAllConferences();
+    public ResponseEntity<List<ConferenceResponseDto>> getAllConferences(
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String city,
+            @RequestParam(required = false) String description,
+            @RequestParam(required = false) String topic,
+            @RequestParam(required = false, defaultValue = "0") Integer page,
+            @RequestParam(required = false, defaultValue = "500") Integer size) {
+
+        List<ConferenceResponseDto> conferences;
+
+        if (isNotEmpty(topic)) {
+            conferences = conferenceService.findByConferenceTopic(topic, page, size);
+        }
+        else if (isNotEmpty(name)) {
+            conferences = conferenceService.findByConferenceName(name, page, size);
+        }
+        else if (isNotEmpty(city)) {
+            conferences = conferenceService.findByConferenceCity(city, page, size);
+        }
+        else if (isNotEmpty(description)) {
+            conferences = conferenceService.findByConferenceDescription(description, page, size);
+        }
+        else {
+            conferences = conferenceService.getAllConferences();
+        }
+
         return ResponseEntity.ok(conferences);
     }
 

SpringProject/MainApplication/src/main/java/gradproject2019/conferences/data/ConferenceResponseDto.java

@@ -1,6 +1,7 @@
 package gradproject2019.conferences.data;
 
 import gradproject2019.conferences.persistence.Conference;
+import gradproject2019.elasticsearch.persistence.EsConference;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
@@ -64,6 +65,17 @@ public ConferenceResponseDto from(Conference conference) {
                 .build();
     }
 
+    public ConferenceResponseDto from(EsConference esConference) {
+        return new ConferenceResponseDtoBuilder()
+                .withId(esConference.getId())
+                .withName(esConference.getName())
+//                .withDateTime(esConference.getDateTime()) //FIXME: add to EsConference
+                .withCity(esConference.getCity())
+                .withDescription(esConference.getDescription())
+                .withTopic(esConference.getTopic())
+                .build();
+    }
+
     public static final class ConferenceResponseDtoBuilder {
         private Long id;
         private String name;

SpringProject/MainApplication/src/main/java/gradproject2019/conferences/service/ConferenceService.java

@@ -18,4 +18,12 @@ public interface ConferenceService {
     void deleteConference(UUID token, Long conferenceId);
 
     ConferenceResponseDto editConference(UUID token, Long conferenceId, ConferencePatchRequestDto conferencePatchRequestDto);
+
+    List<ConferenceResponseDto> findByConferenceName(String name, Integer page, Integer size);
+
+    List<ConferenceResponseDto> findByConferenceCity(String city, Integer page, Integer size);
+
+    List<ConferenceResponseDto> findByConferenceDescription(String description, Integer page, Integer size);
+
+    List<ConferenceResponseDto> findByConferenceTopic(String topic, Integer page, Integer size);
 }