updated commit

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

@@ -21,8 +21,8 @@ public class Category {
 
     public Category() { }
 
-    @OneToMany(mappedBy = "category_id", fetch = FetchType.EAGER)
-    private Set<Event> events = new HashSet<>();
+//    @OneToMany(mappedBy = "category_id", fetch = FetchType.EAGER)
+//    private Set<Event> events = new HashSet<>();
 
     @OneToMany(mappedBy = "parent_id", fetch = FetchType.EAGER)
     private Set<Subcategory> subcategories = new HashSet<>();
@@ -31,7 +31,7 @@ public class Category {
         this.id = id;
         this.name = name;
         this.short_name = short_name;
-        this.events = events;
+//        this.events = events;
         this.subcategories = subcategories;
     }
 
@@ -59,13 +59,13 @@ public class Category {
         this.short_name = short_name;
     }
 
-    public Set<Event> getEvents() {
-        return events;
-    }
-
-    public void setEvents(Set<Event> events) {
-        this.events = events;
-    }
+//    public Set<Event> getEvents() {
+//        return events;
+//    }
+//
+//    public void setEvents(Set<Event> events) {
+//        this.events = events;
+//    }
 
     public Set<Subcategory> getSubcategories() {
         return subcategories;
@@ -81,7 +81,7 @@ public class Category {
                 ", id=" + id +
                 ", name='" + name + '\'' +
                 ", short_name='" + short_name + '\'' +
-                ", events=" + events +
+//                ", events=" + events +
                 ", subcategories=" + subcategories +
                 '}';
     }

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

@@ -35,23 +35,18 @@ public class Event {
 //    private String logo;
 
 
-    @JsonBackReference
     @ManyToOne
     @JoinColumn(name = "category_id", insertable = false, updatable = false)
-    @Nullable
     private Category category;
 
-    @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;
+//    @ManyToOne
+//    @JsonBackReference
+//    @JoinColumn(name = "venue_id", insertable = false, updatable = false)
+//    private Venue venue;
 
     public Event() { }
 
@@ -69,7 +64,7 @@ public class Event {
         this.created = created;
         this.resource_url = resource_url;
 //        this.logo = logo;
-        this.venue = venue;
+//        this.venue = venue;
     }
 
     @JsonProperty("name")
@@ -91,14 +86,12 @@ public class Event {
     private void unpackEnd(Map<String, Object> end) {
         this.endDate =  LocalDateTime.parse((String) end.get("local"));
     }
-
+//
 //    @JsonProperty("logo")
 //    private void unpackLogo(Map<String, Object> logo) {
 //        this.logo = (String) logo.get("url");
 //    }
 
-
-
     public long getId() { return id; }
 
     public void setId(long id) { this.id = id; }
@@ -111,13 +104,15 @@ public class Event {
 
     public void setEventDescription(String eventDescription) { this.eventDescription = eventDescription; }
 
-    public long getCategory_id() { return category_id; }
+    public Long getCategory_id() { return category_id; }
+
+    public void setCategory_id(Long category_id) { this.category_id = category_id; }
 
-    public void setCategory_id(long category_id) { this.category_id = category_id; }
+    public Long getSubcategory_id() { return subcategory_id; }
 
-    public long getSubcategory_id() { return subcategory_id; }
+    public void setSubcategory_id(Long subcategory_id) { this.subcategory_id = subcategory_id; }
 
-    public void setSubcategory_id(long subcategory_id) { this.subcategory_id = subcategory_id; }
+    public void setVenue_id(Long venue_id) { this.venue_id = venue_id; }
 
     public long getVenue_id() { return venue_id; }
 
@@ -143,29 +138,21 @@ public class Event {
 
     public void setResource_url(String resource_url) { this.resource_url = resource_url; }
 
-    public Category getCategory() {
-        return category;
-    }
+//    public String getLogo() { return logo; }
+//
+//    public void setLogo(String logo) { this.logo = logo; }
 
-    public void setCategory(Category category) {
-        this.category = category;
-    }
+    public Category getCategory() { return category; }
 
-    public Subcategory getSubcategory() {
-        return subcategory;
-    }
+    public void setCategory(Category category) { this.category = category; }
 
-    public void setSubcategory(Subcategory subcategory) {
-        this.subcategory = subcategory;
-    }
+    public Subcategory getSubcategory() { return subcategory; }
 
-    public Venue getVenue() {
-        return venue;
-    }
+    public void setSubcategory(Subcategory subcategory) { this.subcategory = subcategory; }
 
-    public void setVenue(Venue venue) {
-        this.venue = venue;
-    }
+//    public Venue getVenue() { return venue; }
+//
+//    public void setVenue(Venue venue) { this.venue = venue; }
 
     @Override
     public String toString() {
@@ -183,7 +170,7 @@ public class Event {
                 ", resource_url='" + resource_url + '\'' +
                 ", category=" + category +
                 ", subcategory=" + subcategory +
-                ", venue=" + venue +
+//                ", venue=" + venue +
                 '}';
     }
 }

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

@@ -24,15 +24,6 @@ public class EventController {
     @Autowired
     private EventRepository repository;
 
-    @Autowired
-    private VenueRepository venueRepository;
-
-    @Autowired
-    private CategoryRepository categoryRepository;
-
-    @Autowired
-    private SubcategoryRepository subcategoryRepository;
-
     @GetMapping("/events")
     public Event getAll(){
         return eventService.getPhillyEvents();
@@ -43,15 +34,25 @@ public class EventController {
         return repository.findAll();
     }
 
-    @GetMapping("/events/{id}")
-    public Event getEvent(@PathVariable long id) {
-        Event event = repository.findById(id).get();
-        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("event/category/{categoryId}")
+    public List<Event> getEventByCategory(@PathVariable Long categoryId) {
+        return repository.findByCategory_Id(categoryId);
+    }
+
+    @GetMapping("event/subcategory/{subcategoryId}")
+    public List<Event> getEventBySubcategory(@PathVariable Long subcategoryId) {
+        return repository.findBySubcategory_Id(subcategoryId);
     }
 
+//    @GetMapping("/events/{id}")
+//    public Event getEvent(@PathVariable long id) {
+//        Event event = repository.findById(id).get();
+//        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,6 +1,8 @@
 package com.proximity.demo.eventbriteApi.Events;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -8,9 +10,7 @@ import java.util.List;
 
 @Repository
 public interface EventRepository extends JpaRepository<Event, Long> {
-
     Event findByEventName(String name);
-
     List<Event> findByCategory_Id(Long categoryId);
-
+    List<Event> findBySubcategory_Id(Long subcategoryId);
 }

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

@@ -22,13 +22,17 @@ public class Subcategory {
     private String name;
     private int parent_id;
 
+//    @OneToMany(mappedBy = "subcategory_id")
+//    private Set<Event> event = new HashSet<>();
+
+
     public Subcategory() {}
 
     public Subcategory(long id, String name, int parent_id, Set<Event> event) {
         this.id = id;
         this.name = name;
         this.parent_id = parent_id;
-        this.event = event;
+//        this.event = event;
 //        this.category = category;
     }
 
@@ -37,8 +41,10 @@ public class Subcategory {
         this.parent_id = Integer.valueOf((String)parent_category.get("id"));
     }
 
-    @OneToMany(mappedBy = "subcategory_id")
-    private Set<Event> event = new HashSet<>();
+//    @ManyToOne(fetch = FetchType.EAGER)
+//    @JoinColumn(name = "parent_id")
+//    private Category category;
+
 
 
     public long getId() {
@@ -66,13 +72,13 @@ public class Subcategory {
     }
 
 
-    public Set<Event> getEvent() {
-        return event;
-    }
-
-    public void setEvent(Set<Event> event) {
-        this.event = event;
-    }
+//    public Set<Event> getEvent() {
+//        return event;
+//    }
+//
+//    public void setEvent(Set<Event> event) {
+//        this.event = event;
+//    }
 
     @Override
     public String toString() {
@@ -80,7 +86,7 @@ public class Subcategory {
                 ", id=" + id +
                 ", name='" + name + '\'' +
                 ", parent_id=" + parent_id +
-                ", event=" + event +
+//                ", event=" + event +
                 '}';
     }
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 @Repository
 public interface SubcategoryRepository extends JpaRepository<Subcategory, Long> {
 
-    Subcategory findSubcategoryByEvent(List<Event> event);
+//    Subcategory findSubcategoryByEvent(List<Event> event);
 
 //    String findSubcategory(long eventID);
 }

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

@@ -26,10 +26,13 @@ public class SubcategoryService {
     }
 
     public Subcategory getSubcategories() {
-        String url = "http://www.eventbriteapi.com/v3/subcategories?"
-                + "token=" + token;
-        SubcategoryWrapper wrapper = restTemplate.getForObject(url, SubcategoryWrapper.class);
-        subcategoryRepository.saveAll(wrapper.getSubcategories());
+        for(int i = 0; i <= 4; i++) {
+            String url = "http://www.eventbriteapi.com/v3/subcategories?"
+                    + "token=" + token
+                    + "&page=" + i;
+            SubcategoryWrapper wrapper = restTemplate.getForObject(url, SubcategoryWrapper.class);
+            subcategoryRepository.saveAll(wrapper.getSubcategories());
+        }
         return null;
     }
 

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

@@ -35,6 +35,9 @@ public class Venue implements Serializable {
     private int age_restriction;
     private int capacity;
 
+    @OneToMany(mappedBy = "venue_id", fetch = FetchType.EAGER)
+    private Set<Event> event = new HashSet<>();
+
     public Venue() {
 
     }
@@ -70,9 +73,6 @@ public class Venue implements Serializable {
         this.country = (String) address.get("country");
     }
 
-    @OneToMany(mappedBy = "venue_id", fetch = FetchType.EAGER)
-    private Set<Event> event = new HashSet<>();
-
     public Long getId() { return id; }
 
     public void setId(Long id) { this.id = id; }

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

@@ -20,11 +20,16 @@ public class VenueController {
     @Autowired
     private VenueRepository venueRepository;
 
-    @Async
-    @GetMapping("/venues")
-    public Venue getAll() {
-        return venueService.getEventVenue();
+    @GetMapping("/v")
+    public Venue get() {
+        return venueService.getEventV();
     }
+//
+//    @Async
+//    @GetMapping("/venues")
+//    public Venue getAll() {
+//        return venueService.getVenue();
+//    }
 
     @GetMapping("/venue")
     public List<Venue> getVenue() {

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

@@ -27,11 +27,19 @@ public class VenueService {
         this.venueRepository = venueRepository;
     }
 
+    public Venue getEventV() {
+        String url = "https://www.eventbriteapi.com/v3/venues/15846940"
+                + "?token=" + token;
+        Venue venue = restTemplate.getForObject(url, Venue.class);
+        venueRepository.save(venue);
+        return null;
+    }
+
     @Async
     public Venue getEventVenue(){
-        List<Event> events = new ArrayList<>(eventRepository.findAll());
-        for(int i = 0; i < events.size(); i++) {
-            Long venue_id = events.get(i).getVenue_id();
+        List<Event> events = eventRepository.findAll();
+        for(Event event : events) {
+            Long venue_id = event.getVenue_id();
             String url = "https://www.eventbriteapi.com/v3/venues/"
                     + venue_id
                     + "?token=" + token;
@@ -41,6 +49,19 @@ public class VenueService {
         return null;
     }
 
+//    public Venue getVenue(){
+//    List<Event> events = eventRepository.findAll();
+//    for(int i = 1475; i < events.size(); i++) {
+//        Long venue_id = events.get(i).getVenue_id();
+//        String url = "https://www.eventbriteapi.com/v3/venues/"
+//                + venue_id
+//                + "?token=" + token;
+//        Venue venue = restTemplate.getForObject(url, Venue.class);
+//        venueRepository.save(venue);
+//        }
+//        return null;
+//    }
+
     private Venue save(Venue venue) { return this.venueRepository.save(venue); }
 
     public Venue find(String name) { return this.venueRepository.findByName(venue.getName()); }

src/main/resources/application.properties

@@ -4,4 +4,5 @@ spring.datasource.password=molonlabe27
 spring.jpa.show-sql=true
 jdbcCompliantTruncation=false&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF-8
 spring.jpa.hibernate.ddl-auto=update
+#logging.level.org.springframework.web=DEBUG