WORKING SEARCH QUERY

src/main/java/com/proximity/demo/eventbriteApi/Events/Event.java

@@ -1,19 +1,15 @@
 package com.proximity.demo.eventbriteApi.Events;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.proximity.demo.eventbriteApi.Categories.Category;
 import com.proximity.demo.eventbriteApi.Subcategories.Subcategory;
-import com.proximity.demo.eventbriteApi.Venues.Venue;
-import io.micrometer.core.lang.Nullable;
 
 import javax.persistence.*;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 @Entity
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -27,8 +23,8 @@ public class Event {
     private Long category_id;
     private Long subcategory_id;
     private Long venue_id;
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
+    private LocalDate start_date;
+    private LocalDate endDate;
     private String status;
     private Date created;
     private String resource_url;
@@ -51,14 +47,14 @@ public class Event {
     public Event() { }
 
     public Event(String eventName, String eventDescription, long category_id, long subcategory_id, long venue_id,
-                 LocalDateTime startDate, LocalDateTime endDate, String status, Date created, String resource_url,
+                 LocalDate start_date, LocalDate endDate, String status, Date created, String resource_url,
                  String logo) {
         this.eventName = eventName;
         this.eventDescription = eventDescription;
         this.category_id = category_id;
         this.subcategory_id = subcategory_id;
         this.venue_id = venue_id;
-        this.startDate = startDate;
+        this.start_date = start_date;
         this.endDate = endDate;
         this.status = status;
         this.created = created;
@@ -79,12 +75,12 @@ public class Event {
 
     @JsonProperty("start")
     private void unpackStart(Map<String, Object> start) {
-        this.startDate = LocalDateTime.parse((String) start.get("local"));
+        this.start_date = LocalDate.from(LocalDateTime.parse((String) start.get("local")));
     }
 
     @JsonProperty("end")
     private void unpackEnd(Map<String, Object> end) {
-        this.endDate =  LocalDateTime.parse((String) end.get("local"));
+        this.endDate = LocalDate.from(LocalDateTime.parse((String) end.get("local")));
     }
 //
 //    @JsonProperty("logo")
@@ -118,13 +114,21 @@ public class Event {
 
     public void setVenue_id(long venue_id) { this.venue_id = venue_id; }
 
-    public LocalDateTime getStartDate() { return startDate; }
+    public LocalDate getStart_date() {
+        return start_date;
+    }
 
-    public void setStartDate(LocalDateTime startDate) { this.startDate = startDate; }
+    public void setStart_date(LocalDate start_date) {
+        this.start_date = start_date;
+    }
 
-    public LocalDateTime getEndDate() { return endDate; }
+    public LocalDate getEndDate() {
+        return endDate;
+    }
 
-    public void setEndDate(LocalDateTime endDate) { this.endDate = endDate; }
+    public void setEndDate(LocalDate endDate) {
+        this.endDate = endDate;
+    }
 
     public String getStatus() { return status; }
 
@@ -154,23 +158,4 @@ public class Event {
 //
 //    public void setVenue(Venue venue) { this.venue = venue; }
 
-    @Override
-    public String toString() {
-        return "Event{" +
-                "id=" + id +
-                ", eventName='" + eventName + '\'' +
-                ", eventDescription='" + eventDescription + '\'' +
-                ", category_id=" + category_id +
-                ", subcategory_id=" + subcategory_id +
-                ", venue_id=" + venue_id +
-                ", startDate=" + startDate +
-                ", endDate=" + endDate +
-                ", status='" + status + '\'' +
-                ", created=" + created +
-                ", resource_url='" + resource_url + '\'' +
-                ", category=" + category +
-                ", subcategory=" + subcategory +
-//                ", venue=" + venue +
-                '}';
-    }
 }

src/main/java/com/proximity/demo/eventbriteApi/Events/EventController.java

@@ -1,17 +1,11 @@
 package com.proximity.demo.eventbriteApi.Events;
 
-
-import com.proximity.demo.eventbriteApi.Categories.CategoryRepository;
-import com.proximity.demo.eventbriteApi.Subcategories.SubcategoryRepository;
-import com.proximity.demo.eventbriteApi.Venues.VenueRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @RestController
@@ -51,7 +45,7 @@ public class EventController {
 //        event.setCategory(categoryRepository.findById(event.getCategory_id()).orElse(null));
 //        event.setSubcategory(subcategoryRepository.findById(event.getSubcategory_id()).orElse(null));
 //        return event;
-//    }
+//    }x`
 
     @GetMapping("/events/{categoryId}")
     public List<Event> getEventByCategory(@PathVariable long category_id) {

src/main/java/com/proximity/demo/eventbriteApi/Venues/VenueController.java

@@ -1,13 +1,18 @@
 package com.proximity.demo.eventbriteApi.Venues;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 
 @RestController
@@ -31,6 +36,28 @@ public class VenueController {
 //        return venueService.getVenue();
 //    }
 
+//    @GetMapping("/venue/category/{category_id}/{start_date}")
+//    public List<Venue> getVenues(
+//            @PathVariable(value="category_id") long category_id,
+//            @PathVariable(value="start_date") String start_date) {
+//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.US);
+//        LocalDate dateTime = LocalDate.parse(start_date, formatter);
+//
+//        return venueRepository.findByCategory(category_id, dateTime);
+//    }
+    @GetMapping("/venue/category/{category_id}/{input_start_date}")
+    public List<Venue> getVenues(
+        @PathVariable(value="category_id") long category_id,
+        @PathVariable(value="input_start_date") String input_start_date) {
+    return venueRepository.findByCategory(category_id, input_start_date);
+}
+
+    @GetMapping("/venue/category/{category_id}")
+    public List<Venue> getVenues2(
+            @PathVariable(value="category_id") long category_id) {
+        return venueRepository.findByCategoryId(category_id);
+    }
+
     @GetMapping("/venue")
     public List<Venue> getVenue() {
         return venueRepository.findAll();

src/main/java/com/proximity/demo/eventbriteApi/Venues/VenueRepository.java

@@ -2,39 +2,26 @@ package com.proximity.demo.eventbriteApi.Venues;
 
 import com.proximity.demo.eventbriteApi.Events.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
 public interface VenueRepository extends JpaRepository<Venue, Long> {
 
+    Venue findByName(String name);
 
-//    Venue findVenueByEvent(List<Event> Event);
+//    @Query("select v from Venue v join v.event as e where e.category_id = ?1 AND CAST(start_date as date) = DATE_FORMAT('%Y-%m-%d')")
+//    List<Venue> findByCategory(long category_id, LocalDate start_Date);
 
-    Venue findByName(String name);
+//    @Query("select v from Venue v join v.event as e where e.category_id = ?1 AND input_start_date = DATE_FORMAT(e.start_date, '%Y-%m-%d')")
+    @Query("select v from Venue v join v.event as e where e.category_id = ?1 AND DATE_FORMAT(e.start_date, '%Y-%m-%d') = ?2")
+    List<Venue> findByCategory(long category_id, String input_start_date);
+
+    @Query("select v from Venue v join v.event as e where e.category_id =?1")
+    List<Venue> findByCategoryId(long category_id);
 
-//    List<Venue> findVenuesByEvent(List<Event> event);
-//
-//    String findByName(long id);
-//
-//    String findByAddress1(long id);
-//
-//    String findByAddress2(long id);
-//
-//    String findVenueCity(long id);
-//
-//    String findVenuePostalCode(long id);
-//
-//    String findVenueLat(long id);
-//
-//    String findVenuelng(long id);
-//
-//    String findVenueLocalized(long id);
-//
-//    String findVenueURL(long id);
-//
-//    int findVenueAgeRestriction(long id);
-//
-//    int findVenueCapacity(long id);
 }