Setting up relationship between events and event categories

gildedgardenia · gildedgardenia · commit 00fffe3ec3e1 · 2023-08-23T12:24:22.000-05:00
diff --git a/src/main/java/org/launchcode/codingevents/controllers/EventController.java b/src/main/java/org/launchcode/codingevents/controllers/EventController.java
@@ -2,13 +2,15 @@
 
 import jakarta.validation.Valid;
 import org.launchcode.codingevents.data.EventRepository;
+import org.launchcode.codingevents.data.EventCategoryRepository;
 import org.launchcode.codingevents.models.Event;
-import org.launchcode.codingevents.models.EventType;
+import org.launchcode.codingevents.models.EventCategory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
+import java.util.Optional;
 
 /**
  * Created by Chris Bay
@@ -19,6 +21,9 @@ public class EventController {
     @Autowired
     private EventRepository eventRepository;
 
+    @Autowired
+    private EventCategoryRepository eventCategoryRepository;
+
     @GetMapping
     public String displayAllEvents(Model model) {
         model.addAttribute("title", "All Events");
@@ -30,7 +35,7 @@ public String displayAllEvents(Model model) {
     public String displayCreateEventForm(Model model) {
         model.addAttribute("title", "Create Event");
         model.addAttribute(new Event());
-        model.addAttribute("types", EventType.values());
+        model.addAttribute("categories", eventCategoryRepository.findAll());
         return "events/create";
     }
 
diff --git a/src/main/java/org/launchcode/codingevents/models/Event.java b/src/main/java/org/launchcode/codingevents/models/Event.java
@@ -1,8 +1,10 @@
 package org.launchcode.codingevents.models;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 /**
@@ -22,13 +24,15 @@ public class Event extends AbstractEntity  {
     @Email(message = "Invalid email. Try again.")
     private String contactEmail;
 
-    private EventType type;
+    @ManyToOne
+    @NotNull(message = "Category is required")
+    private EventCategory eventCategory;
 
-    public Event(String name, String description, String contactEmail, EventType type) {
+    public Event(String name, String description, String contactEmail, EventCategory eventCategory) {
         this.name = name;
         this.description = description;
         this.contactEmail = contactEmail;
-        this.type = type;
+        this.eventCategory = eventCategory;
     }
 
     public Event() {}
@@ -57,12 +61,12 @@ public void setContactEmail(String contactEmail) {
         this.contactEmail = contactEmail;
     }
 
-    public EventType getType() {
-        return type;
+    public EventCategory getEventCategory() {
+        return eventCategory;
     }
 
-    public void setType(EventType type) {
-        this.type = type;
+    public void setEventCategory(EventCategory eventCategory) {
+        this.eventCategory = eventCategory;
     }
 
     @Override
diff --git a/src/main/java/org/launchcode/codingevents/models/EventCategory.java b/src/main/java/org/launchcode/codingevents/models/EventCategory.java
@@ -1,7 +1,10 @@
 package org.launchcode.codingevents.models;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
 import jakarta.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Chris Bay
diff --git a/src/main/java/org/launchcode/codingevents/models/EventType.java b/src/main/java/org/launchcode/codingevents/models/EventType.java
diff --git a/src/main/resources/templates/eventCategories/index.html b/src/main/resources/templates/eventCategories/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org/">
-<head th:replace="fragments :: head"></head>
+<head th:replace="~{fragments :: head}"></head>
 <body class="container">
 
-<header th:replace="fragments :: header"></header>
+<header th:replace="~{fragments :: header}"></header>
 
 <table class="table table-striped">
     <thead>
diff --git a/src/main/resources/templates/events/create.html b/src/main/resources/templates/events/create.html
@@ -27,13 +27,14 @@
         <p class="error" th:errors="${event.contactEmail}"></p>
     </div>
     <div class="form-group">
-        <label>Type
-            <select th:field="${event.type}">
-                <option th:each="type : ${types}"
-                        th:value="${type}"
-                        th:text="${type.displayName}"
+        <label>Category
+            <select th:field="${event.eventCategory}">
+                <option th:each="eventCategory : ${categories}"
+                        th:value="${eventCategory.id}"
+                        th:text="${eventCategory.name}"
                 ></option>
             </select>
+            <p class="error" th:errors="${event.eventCategory}"></p>
         </label>
     </div>
     <div class="form-group">
diff --git a/src/main/resources/templates/events/index.html b/src/main/resources/templates/events/index.html
@@ -12,15 +12,15 @@
         <th>Name</th>
         <th>Description</th>
         <th>Contact Email</th>
-        <th>Type</th>
+        <th>Category</th>
     </tr>
     </thead>
     <tr th:each="event : ${events}">
         <td th:text="${event.id}"></td>
         <td th:text="${event.name}"></td>
         <td th:text="${event.description}"></td>
         <td th:text="${event.contactEmail}"></td>
-        <td th:text="${event.type.displayName}"></td>
+        <td th:text="${event.eventCategory.name}"></td>
     </tr>
 </table>
 
