many-to-one branch

Maria Usina · Maria Usina · commit 191187d5a237 · 2025-01-15T19:14:42.000-06:00
diff --git a/src/main/java/org/launchcode/codingevents/controllers/EventController.java b/src/main/java/org/launchcode/codingevents/controllers/EventController.java
@@ -1,9 +1,9 @@
 package org.launchcode.codingevents.controllers;
 
 import jakarta.validation.Valid;
+import org.launchcode.codingevents.data.EventCategoryRepository;
 import org.launchcode.codingevents.data.EventRepository;
 import org.launchcode.codingevents.models.Event;
-import org.launchcode.codingevents.models.EventType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.Errors;
@@ -25,6 +25,9 @@ public class EventController {
     @Autowired
     private EventRepository eventRepository;
 
+    @Autowired
+    private EventCategoryRepository eventCategoryRepository;
+
     @GetMapping
     public String displayAllEvents(Model model) {
         model.addAttribute("title", "All Events");
@@ -36,7 +39,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
@@ -4,6 +4,7 @@
 
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.*;
 
 import java.util.Objects;
@@ -27,12 +28,14 @@ public class Event extends AbstractEntity {
     @NotNull
     private String location;
 
-    private EventType type;
+    @ManyToOne
+    @NotNull(message = "Category is required")
+    private EventCategory eventCategory;
 
-    public Event(String name, String description, String contactEmail, String location, EventType type) {
+    public Event(String name, String description, String contactEmail, String location, EventCategory eventCategory) {
         this.name = name;
         this.description = description;
-        this.type = type;
+        this.eventCategory = eventCategory;
         this.location = location;
         this.contactEmail = contactEmail;
 
@@ -72,17 +75,14 @@ public void setLocation(String location) {
         this.location = location;
     }
 
-
-    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
     public String toString() {
         return name;
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/events/create.html b/src/main/resources/templates/events/create.html
@@ -26,12 +26,13 @@ <h1>Create Event</h1>
 
     <div class="form-group">
         <label>Type
-            <select th:field="${event.type}">
-                <option th:each="type : ${types}"
-                        th:value="${type}"
-                        th:text="${type.displayName}"
+            <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>
 
diff --git a/src/main/resources/templates/events/index.html b/src/main/resources/templates/events/index.html
@@ -17,7 +17,7 @@ <h1>All Events</h1>
         <th>ID</th>
         <th>Name</th>
         <th>Description</th>
-        <th>Type</th>
+        <th>Category</th>
         <th>Location</th>
         <th>Contact Email</th>
     </tr>
@@ -26,7 +26,7 @@ <h1>All Events</h1>
         <td th:text="${event.id}"></td>
         <td th:text="${event.name}"></td>
         <td th:text="${event.description}"></td>
-        <td th:text="${event.type.displayName}"></td>
+        <td th:text="${event.eventCategory.name}"></td>
         <td th:text="${event.location}"></td>
         <td th:text="${event.contactEmail}"></td>
     </tr>
diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
@@ -12,7 +12,6 @@
 <body>
 
 <nav th:fragment="navigation">
-    <h1 th:text="${title}">Coding Events</h1>
     <ul class="nav">
         <li class="nav-item"><a class="nav-link" href="/events">All Events</a></li>
         <li class="nav-item"><a class="nav-link" href="/events/create">Create Event</a></li>
