updated commit

src/main/java/com/proximity/demo/eventbriteApi/Categories/Category.java

@@ -10,7 +10,7 @@ import java.util.Set;
 
 @Entity
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Table(name="CATEGORY")
+@Table(name="categories")
 public class Category {
 
     @Id
@@ -21,7 +21,7 @@ public class Category {
 
     public Category() { }
 
-    @ManyToMany(mappedBy = "category", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "category_id", fetch = FetchType.EAGER)
     private Set<Event> events = new HashSet<>();
 
     @OneToMany(mappedBy = "parent_id", fetch = FetchType.EAGER)

src/main/java/com/proximity/demo/eventbriteApi/Categories/CategoryService.java

@@ -8,7 +8,7 @@ import org.springframework.web.client.RestTemplate;
 @Service
 public class CategoryService {
 
-    private static final String token = "SMEZ5DGCKW5IDHS7HXNI";
+    private static final String token = "FW5VNKL6N5VMXKQO7TFV";
     private final RestTemplate restTemplate;
     private CategoryRepository categoryRepository;
 

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

@@ -1,11 +1,12 @@
 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.fasterxml.jackson.databind.annotation.JsonSerialize;
 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.LocalDateTime;
@@ -21,28 +22,36 @@ public class Event {
 
     @Id
     private long id;
-    @Column(unique = true)
     private String eventName;
-    @Column(length = 10000)
     private String eventDescription;
-    private long category_id;
-    private long subcategory_id;
-    private long venue_id;
+    private Long category_id;
+    private Long subcategory_id;
+    private Long venue_id;
     private LocalDateTime startDate;
     private LocalDateTime endDate;
     private String status;
     private Date created;
     private String resource_url;
-    private String logo;
+//    private String logo;
 
-    @Transient
-    private Category oneCategory;
 
-    @Transient
-    private Subcategory oneSubcategory;
+    @JsonBackReference
+    @ManyToOne
+    @JoinColumn(name = "category_id", insertable = false, updatable = false)
+    @Nullable
+    private Category category;
 
-    @Transient
-    private Venue oneVenue;
+    @JsonBackReference
+    @ManyToOne
+    @JoinColumn(name = "subcategory_id", insertable = false, updatable = false)
+    @Nullable
+    private Subcategory subcategory;
+
+    @JsonBackReference
+    @ManyToOne
+    @JoinColumn(name = "venue_id", insertable = false, updatable = false)
+    @Nullable
+    private Venue venue;
 
     public Event() { }
 
@@ -59,7 +68,7 @@ public class Event {
         this.status = status;
         this.created = created;
         this.resource_url = resource_url;
-        this.logo = logo;
+//        this.logo = logo;
         this.venue = venue;
     }
 
@@ -83,28 +92,11 @@ public class Event {
         this.endDate =  LocalDateTime.parse((String) end.get("local"));
     }
 
-    @JsonProperty("logo")
-    private void unpackLogo(Map<String, Object> logo) {
-        this.logo = (String) logo.get("url");
-    }
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name="event_venue",
-            joinColumns=@JoinColumn(name="event_id"),
-            inverseJoinColumns=@JoinColumn(name="venue_id"))
-    private Set<Venue> venue = new HashSet<>();
+//    @JsonProperty("logo")
+//    private void unpackLogo(Map<String, Object> logo) {
+//        this.logo = (String) logo.get("url");
+//    }
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name="event_category",
-    joinColumns = @JoinColumn(name="category_id"),
-    inverseJoinColumns=@JoinColumn(name="event_id"))
-    private Set<Category> category = new HashSet<>();
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name="Event_subcategory",
-    joinColumns = @JoinColumn(name="subcategory_id"),
-    inverseJoinColumns = @JoinColumn(name="event_id"))
-    private Set<Subcategory> subcategory = new HashSet<>();
 
 
     public long getId() { return id; }
@@ -151,40 +143,28 @@ public class Event {
 
     public void setResource_url(String resource_url) { this.resource_url = resource_url; }
 
-    public String getLogo() { return logo; }
-
-    public void setLogo(String logo) { this.logo = logo; }
-
-    public Set<Venue> getVenue() { return venue; }
-
-    public void setVenue(Set<Venue> venue) { this.venue = venue; }
-
-    public Set<Category> getCategory() { return category; }
-
-    public void setCategory(Set<Category> category) { this.category = category; }
-
-    public Category getOneCategory() {
-        return oneCategory;
+    public Category getCategory() {
+        return category;
     }
 
-    public void setOneCategory(Category oneCategory) {
-        this.oneCategory = oneCategory;
+    public void setCategory(Category category) {
+        this.category = category;
     }
 
-    public Subcategory getOneSubcategory() {
-        return oneSubcategory;
+    public Subcategory getSubcategory() {
+        return subcategory;
     }
 
-    public void setOneSubcategory(Subcategory oneSubcategory) {
-        this.oneSubcategory = oneSubcategory;
+    public void setSubcategory(Subcategory subcategory) {
+        this.subcategory = subcategory;
     }
 
-    public Venue getOneVenue() {
-        return oneVenue;
+    public Venue getVenue() {
+        return venue;
     }
 
-    public void setOneVenue(Venue oneVenue) {
-        this.oneVenue = oneVenue;
+    public void setVenue(Venue venue) {
+        this.venue = venue;
     }
 
     @Override
@@ -201,17 +181,9 @@ public class Event {
                 ", status='" + status + '\'' +
                 ", created=" + created +
                 ", resource_url='" + resource_url + '\'' +
-                ", logo='" + logo + '\'' +
+                ", category=" + category +
+                ", subcategory=" + subcategory +
                 ", venue=" + venue +
                 '}';
     }
-
-    public Set<Subcategory> getSubcategory() {
-        return subcategory;
-    }
-
-
-    public void setSubcategory(Set<Subcategory> subcategory) {
-        this.subcategory = subcategory;
-    }
 }

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

@@ -2,11 +2,8 @@ package com.proximity.demo.eventbriteApi.Events;
 
 
 import com.proximity.demo.eventbriteApi.Categories.CategoryRepository;
-import com.proximity.demo.eventbriteApi.Subcategories.Subcategory;
 import com.proximity.demo.eventbriteApi.Subcategories.SubcategoryRepository;
-import com.proximity.demo.eventbriteApi.Venues.Venue;
 import com.proximity.demo.eventbriteApi.Venues.VenueRepository;
-import com.proximity.demo.eventbriteApi.Venues.VenueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,8 +11,8 @@ 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;
-import java.util.stream.Collectors;
 
 @RestController
 @CrossOrigin
@@ -37,17 +34,26 @@ public class EventController {
     private SubcategoryRepository subcategoryRepository;
 
     @GetMapping("/events")
-    public List<Event> getAll(){
-        eventService.getEventsInPhilly();
+    public Event getAll(){
+        return eventService.getPhillyEvents();
+    }
+
+    @GetMapping("/event")
+    public List<Event> getEvent() {
         return repository.findAll();
     }
 
     @GetMapping("/events/{id}")
     public Event getEvent(@PathVariable long id) {
         Event event = repository.findById(id).get();
-        event.setOneVenue(venueRepository.findById(event.getVenue_id()).orElse(null));
-        event.setOneCategory(categoryRepository.findById(event.getCategory_id()).orElse(null));
-        event.setOneSubcategory(subcategoryRepository.findById(event.getSubcategory_id()).orElse(null));
+        event.setVenue(venueRepository.findById(event.getVenue_id()).orElse(null));
+        event.setCategory(categoryRepository.findById(event.getCategory_id()).orElse(null));
+        event.setSubcategory(subcategoryRepository.findById(event.getSubcategory_id()).orElse(null));
         return event;
     }
+
+    @GetMapping("/events/{categoryId}")
+    public List<Event> getEventByCategory(@PathVariable long category_id) {
+        return null;
+    }
 }

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

@@ -1,13 +1,16 @@
 package com.proximity.demo.eventbriteApi.Events;
 
-import com.proximity.demo.eventbriteApi.Venues.Venue;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+
 @Repository
 public interface EventRepository extends JpaRepository<Event, Long> {
 
-    Event findByVenue(Venue venue);
-
     Event findByEventName(String name);
+
+    List<Event> findByCategory_Id(Long categoryId);
+
 }

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

@@ -5,6 +5,7 @@ import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
@@ -12,7 +13,8 @@ import org.springframework.web.client.RestTemplate;
 @Service
 public class EventService{
 
-    private static final String token = "SMEZ5DGCKW5IDHS7HXNI";
+    private static final String mainUrl = "https://www.eventbriteapi.com/v3/";
+    private static final String token = "FW5VNKL6N5VMXKQO7TFV";
     private final RestTemplate restTemplate;
     private Event Event = new Event();
     private EventRepository eventRepository;
@@ -23,12 +25,17 @@ public class EventService{
         this.eventRepository = eventRepository;
     }
 
-    public Event getEventsInPhilly() {
-        String url = "https://www.eventbriteapi.com/v3/events/search/?"
-                + "token=" + token
-                + "&location.address=philadelphia";
-        EventWrapper wrapper = restTemplate.getForObject(url, EventWrapper.class);
-        eventRepository.saveAll(wrapper.getEvents());
+    @Async
+    public Event getPhillyEvents() {
+        for(int i = 1; i < 50; i++) {
+            String url = mainUrl
+                    + "events/search/"
+                    + "?token=" + token
+                    + "&location.address=philadelphia"
+                    + "&page=" + i;
+            EventWrapper wrapper = restTemplate.getForObject(url, EventWrapper.class);
+            eventRepository.saveAll((wrapper.getEvents()));
+        }
         return null;
     }
 

src/main/java/com/proximity/demo/eventbriteApi/Marker/MarkerDTO.java

@@ -1,67 +0,0 @@
-package com.proximity.demo.eventbriteApi.Marker;
-
-import com.proximity.demo.eventbriteApi.Categories.Category;
-import com.proximity.demo.eventbriteApi.Categories.CategoryRepository;
-import com.proximity.demo.eventbriteApi.Events.Event;
-import com.proximity.demo.eventbriteApi.Events.EventRepository;
-import com.proximity.demo.eventbriteApi.Subcategories.Subcategory;
-import com.proximity.demo.eventbriteApi.Subcategories.SubcategoryRepository;
-import com.proximity.demo.eventbriteApi.Venues.Venue;
-import com.proximity.demo.eventbriteApi.Venues.VenueRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.persistence.Entity;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-
-//@Entity
-public class MarkerDTO {
-
-    @Autowired
-    EventRepository er;
-
-    @Autowired
-    VenueRepository vr;
-
-    @Autowired
-    CategoryRepository cr;
-
-    @Autowired
-    SubcategoryRepository sr;
-
-    private Event event;
-    private Venue venue;
-    private Category category;
-    private Subcategory subcategory;
-
-    public MarkerDTO(Event event, Venue venue, Category category, Subcategory subcategory) {
-        this.event = event;
-        this.venue = venue;
-        this.category = category;
-        this.subcategory = subcategory;
-    }
-
-    public Event getEvent() { return event; }
-
-//    public void setEvent(Event event) { this.event = er.findAll(); }
-
-    public Venue getVenue() { return venue; }
-
-    public void setVenue(Venue venue) { this.venue = vr.findVenueByEvent(Collections.singletonList(getEvent())); }
-
-    public Category getCategory() { return category; }
-
-    public void setCategory(Category category) { this.category = null;
-//            cr.findCategoryByEvent(Collections.singletonList(getEvent()));
- }
-
-    public Subcategory getSubcategory() { return subcategory; }
-
-    public void setSubcategory(Subcategory subcategory) { this.subcategory = sr.findSubcategoryByEvent(Collections.singletonList(getEvent())); }
-}
-
-

src/main/java/com/proximity/demo/eventbriteApi/Subcategories/Subcategory.java

@@ -13,7 +13,7 @@ import java.util.Set;
 
 @Entity
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Table(name="SUBCATEGORY")
+@Table(name="Subcategories")
 public class Subcategory {
 
     @Id
@@ -37,11 +37,7 @@ public class Subcategory {
         this.parent_id = Integer.valueOf((String)parent_category.get("id"));
     }
 
-//    @ManyToOne(fetch = FetchType.EAGER)
-//    @JoinColumn(name = "parent_id")
-//    private Category category;
-
-    @ManyToMany(mappedBy = "subcategory")
+    @OneToMany(mappedBy = "subcategory_id")
     private Set<Event> event = new HashSet<>();
 
 

src/main/java/com/proximity/demo/eventbriteApi/Subcategories/SubcategoryService.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Service
 public class SubcategoryService {
 
-    private static final String token = "SMEZ5DGCKW5IDHS7HXNI";
+    private static final String token = "FW5VNKL6N5VMXKQO7TFV";
     private final RestTemplate restTemplate;
     private EventRepository eventRepository;
     private SubcategoryRepository subcategoryRepository;

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

@@ -1,6 +1,8 @@
 package com.proximity.demo.eventbriteApi.Venues;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.proximity.demo.eventbriteApi.Events.Event;
 
@@ -12,7 +14,7 @@ import java.util.Set;
 
 @Entity
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Table(name="VENUE")
+@Table(name="venues")
 public class Venue implements Serializable {
 
     @Id
@@ -29,10 +31,13 @@ public class Venue implements Serializable {
     private String longitude;
     private String localized_multi_line_address_display;
     private String resource_uri;
+    @JsonIgnore
     private int age_restriction;
     private int capacity;
 
-    public Venue() { }
+    public Venue() {
+
+    }
 
     public Venue(String name, String address_1, String address_2, String city, String region,
                  String postal_code, String country, String latitude, String longitude,
@@ -65,7 +70,7 @@ public class Venue implements Serializable {
         this.country = (String) address.get("country");
     }
 
-    @ManyToMany(mappedBy = "venue", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "venue_id", fetch = FetchType.EAGER)
     private Set<Event> event = new HashSet<>();
 
     public Long getId() { return id; }

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

@@ -1,11 +1,14 @@
 package com.proximity.demo.eventbriteApi.Venues;
 
 import org.springframework.beans.factory.annotation.Autowired;
+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.util.List;
+import java.util.Optional;
 
 @RestController
 @CrossOrigin
@@ -17,9 +20,22 @@ public class VenueController {
     @Autowired
     private VenueRepository venueRepository;
 
+    @Async
     @GetMapping("/venues")
-    public List<Venue> getAll() {
-        venueService.getEventVenue();
+    public Venue getAll() {
+        return venueService.getEventVenue();
+    }
+
+    @GetMapping("/venue")
+    public List<Venue> getVenue() {
         return venueRepository.findAll();
     }
+
+    @GetMapping("/venues/{id}")
+    public Optional<Venue> get(@PathVariable long id) {
+        System.out.println(id);
+        System.out.println(venueRepository.findByName("Monumental Baptist Church"));
+        return venueRepository.findById(id);
+    }
+
 }

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

@@ -9,7 +9,8 @@ import java.util.List;
 @Repository
 public interface VenueRepository extends JpaRepository<Venue, Long> {
 
-    Venue findVenueByEvent(List<Event> Event);
+
+//    Venue findVenueByEvent(List<Event> Event);
 
     Venue findByName(String name);
 

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

@@ -4,6 +4,7 @@ import com.proximity.demo.eventbriteApi.Events.Event;
 import com.proximity.demo.eventbriteApi.Events.EventRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
@@ -13,7 +14,7 @@ import java.util.List;
 @Service
 public class VenueService {
 
-    private static final String token = "SMEZ5DGCKW5IDHS7HXNI";
+    private static final String token = "FW5VNKL6N5VMXKQO7TFV";
     private final RestTemplate restTemplate;
     private Venue venue = new Venue();
     private EventRepository eventRepository;
@@ -26,18 +27,15 @@ public class VenueService {
         this.venueRepository = venueRepository;
     }
 
+    @Async
     public Venue getEventVenue(){
         List<Event> events = new ArrayList<>(eventRepository.findAll());
-        for(int i = 0; i < events.size() - 1; i++) {
+        for(int i = 0; i < events.size(); i++) {
             Long venue_id = events.get(i).getVenue_id();
-
-            //check to see if the venue exist by the id, if it doesn't then save it
-
             String url = "https://www.eventbriteapi.com/v3/venues/"
                     + venue_id
                     + "?token=" + token;
             Venue venue = restTemplate.getForObject(url, Venue.class);
-
             venueRepository.save(venue);
         }
         return null;

src/main/resources/application.properties

@@ -2,4 +2,6 @@ spring.datasource.url= jdbc:mysql://localhost:3306/proximity?useSSL=False
 spring.datasource.username=jdot2791
 spring.datasource.password=molonlabe27
 spring.jpa.show-sql=true
+jdbcCompliantTruncation=false&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF-8
 spring.jpa.hibernate.ddl-auto=update
+

src/test/java/com/proximity/demo/eventbriteApi/Events/eventServiceTest.java

@@ -10,10 +10,4 @@ public class eventServiceTest {
     @Autowired
     EventService eventService;
 
-    @Test
-    public void getEventsInPhilly() {
-        Event expected = eventService.save(new Event());
-        Event actual = eventService.save(eventService.getEventsInPhilly());
-        assertEquals(expected, actual);
     }
-}