updated commit

pom.xml

@@ -21,6 +21,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
         <java.version>1.8</java.version>
     </properties>
 
@@ -98,7 +99,11 @@
             <artifactId>json</artifactId>
             <version>20180130</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -107,8 +112,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>8</source> <!-- or higher, depending on your project -->
+                    <target>8</target> <!-- or higher, depending on your project -->
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
-
-
 </project>

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

@@ -14,11 +14,8 @@ import java.util.Set;
 public class Category {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int categoryid;
-
-    @Column(unique = true)
-    private int id;
+    @Column(unique = true, nullable = false)
+    private long id;
     private String name;
     private String short_name;
 
@@ -27,10 +24,10 @@ public class Category {
     @ManyToMany(mappedBy = "category", fetch = FetchType.EAGER)
     private Set<Event> events = new HashSet<>();
 
-    @OneToMany(mappedBy = "subToCategory", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "parent_id", fetch = FetchType.EAGER)
     private Set<Subcategory> subcategories = new HashSet<>();
 
-    public Category(int id, String name, String short_name, Set<Event> events, Set<Subcategory> subcategories) {
+    public Category(long id, String name, String short_name, Set<Event> events, Set<Subcategory> subcategories) {
         this.id = id;
         this.name = name;
         this.short_name = short_name;
@@ -38,19 +35,11 @@ public class Category {
         this.subcategories = subcategories;
     }
 
-    public int getCategoryid() {
-        return categoryid;
-    }
-
-    public void setCategoryid(int categoryid) {
-        this.categoryid = categoryid;
-    }
-
-    public int getId() {
+    public long getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(long id) {
         this.id = id;
     }
 
@@ -89,7 +78,6 @@ public class Category {
     @Override
     public String toString() {
         return "Category{" +
-                "categoryid=" + categoryid +
                 ", id=" + id +
                 ", name='" + name + '\'' +
                 ", short_name='" + short_name + '\'' +

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

@@ -3,6 +3,7 @@ package com.proximity.demo.eventbriteApi.Categories;
 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.List;
@@ -22,4 +23,9 @@ public class CategoryController {
         categoryService.getCategories();
         return categoryRepository.findAll();
     }
+//
+//    @GetMapping("/categories/{id}")
+//    public Category find(@PathVariable long id){
+//        return categoryRepository.findById(id).get();
+//    }
 }

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

@@ -1,10 +1,15 @@
 package com.proximity.demo.eventbriteApi.Categories;
 
-import com.proximity.demo.eventbriteApi.Subcategories.Subcategory;
+import com.proximity.demo.eventbriteApi.Events.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface CategoryRepository extends JpaRepository<Category, Long> {
 
+//    Category findCategoryByEvent(List<Event> event);
+
+//    String findCategory(Long id);
 }

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

@@ -20,9 +20,6 @@ import java.util.Set;
 public class Event {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long eventId;
-
     private long id;
     @Column(unique = true)
     private String eventName;
@@ -38,11 +35,20 @@ public class Event {
     private String resource_url;
     private String logo;
 
+    @Transient
+    private Category oneCategory;
+
+    @Transient
+    private Subcategory oneSubcategory;
+
+    @Transient
+    private Venue oneVenue;
+
     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,
-                 String logo, Set<Venue> venue) {
+                 String logo) {
         this.eventName = eventName;
         this.eventDescription = eventDescription;
         this.category_id = category_id;
@@ -157,6 +163,30 @@ public class Event {
 
     public void setCategory(Set<Category> category) { this.category = category; }
 
+    public Category getOneCategory() {
+        return oneCategory;
+    }
+
+    public void setOneCategory(Category oneCategory) {
+        this.oneCategory = oneCategory;
+    }
+
+    public Subcategory getOneSubcategory() {
+        return oneSubcategory;
+    }
+
+    public void setOneSubcategory(Subcategory oneSubcategory) {
+        this.oneSubcategory = oneSubcategory;
+    }
+
+    public Venue getOneVenue() {
+        return oneVenue;
+    }
+
+    public void setOneVenue(Venue oneVenue) {
+        this.oneVenue = oneVenue;
+    }
+
     @Override
     public String toString() {
         return "Event{" +

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

@@ -1,13 +1,21 @@
 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;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @CrossOrigin
@@ -19,9 +27,27 @@ public class EventController {
     @Autowired
     private EventRepository repository;
 
+    @Autowired
+    private VenueRepository venueRepository;
+
+    @Autowired
+    private CategoryRepository categoryRepository;
+
+    @Autowired
+    private SubcategoryRepository subcategoryRepository;
+
     @GetMapping("/events")
     public List<Event> getAll(){
         eventService.getEventsInPhilly();
         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));
+        return event;
+    }
 }

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

@@ -0,0 +1,67 @@
+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

@@ -17,22 +17,19 @@ import java.util.Set;
 public class Subcategory {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int subcategoryid;
-
     @Column(unique = true)
-    private int id;
+    private long id;
     private String name;
     private int parent_id;
 
     public Subcategory() {}
 
-    public Subcategory(int id, String name, int parent_id, Category subToCategory, Set<Event> event) {
+    public Subcategory(long id, String name, int parent_id, Set<Event> event) {
         this.id = id;
         this.name = name;
         this.parent_id = parent_id;
-        this.subToCategory = subToCategory;
         this.event = event;
+//        this.category = category;
     }
 
     @JsonProperty("parent_category")
@@ -40,27 +37,19 @@ public class Subcategory {
         this.parent_id = Integer.valueOf((String)parent_category.get("id"));
     }
 
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "category_id")
-    @JsonIgnore
-    private Category subToCategory;
+//    @ManyToOne(fetch = FetchType.EAGER)
+//    @JoinColumn(name = "parent_id")
+//    private Category category;
 
     @ManyToMany(mappedBy = "subcategory")
     private Set<Event> event = new HashSet<>();
 
-    public int getSubcategoryid() {
-        return subcategoryid;
-    }
-
-    public void setSubcategoryid(int subcategoryid) {
-        this.subcategoryid = subcategoryid;
-    }
 
-    public int getId() {
+    public long getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(long id) {
         this.id = id;
     }
 
@@ -80,13 +69,6 @@ public class Subcategory {
         this.parent_id = parent_id;
     }
 
-    public Category getSubToCategory() {
-        return subToCategory;
-    }
-
-    public void setSubToCategory(Category subToCategory) {
-        this.subToCategory = subToCategory;
-    }
 
     public Set<Event> getEvent() {
         return event;
@@ -99,11 +81,9 @@ public class Subcategory {
     @Override
     public String toString() {
         return "Subcategory{" +
-                "subcategoryid=" + subcategoryid +
                 ", id=" + id +
                 ", name='" + name + '\'' +
                 ", parent_id=" + parent_id +
-                ", subToCategory=" + subToCategory +
                 ", event=" + event +
                 '}';
     }

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

@@ -4,8 +4,12 @@ import com.proximity.demo.eventbriteApi.Events.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface SubcategoryRepository extends JpaRepository<Subcategory, Long> {
 
-    Subcategory findSubcategoryByEvent(Event event);
+    Subcategory findSubcategoryByEvent(List<Event> event);
+
+//    String findSubcategory(long eventID);
 }

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

@@ -16,9 +16,6 @@ import java.util.Set;
 public class Venue implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long venueid;
-
     @Column(unique = true)
     private long id;
     private String name;

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

@@ -4,10 +4,36 @@ import com.proximity.demo.eventbriteApi.Events.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface VenueRepository extends JpaRepository<Venue, Long> {
 
-    Venue findVenueByEvent(Event Event);
+    Venue findVenueByEvent(List<Event> Event);
 
     Venue findByName(String name);
+
+//    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);
 }