Part 3

PT-Web-Dev-Jan-23 · Jun 12, 2023 · f8559d9 · f8559d9
1 parent 68b4600
commit f8559d9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/src/main/java/org/launchcode/techjobs/persistent/models/AbstractEntity.java b/src/main/java/org/launchcode/techjobs/persistent/models/AbstractEntity.java
@@ -12,14 +12,14 @@
 public abstract class AbstractEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public Integer id;
+    public int id;
 //    public String name;
 
-    public void setId(Integer id) {
+    public void setId(int id) {
         this.id = id;
     }
 
-    public Integer getId() {
+    public int getId() {
        return id;
     }
 

diff --git a/src/main/java/org/launchcode/techjobs/persistent/models/Employer.java b/src/main/java/org/launchcode/techjobs/persistent/models/Employer.java
@@ -16,8 +16,8 @@ public class Employer extends AbstractEntity {
     @Size(max = 50)
     private String location;
 
-    @OneToMany(mappedBy = "employer")
-    private List<Skill> skills;
+//    @OneToMany(mappedBy = "employer")
+//    private List<Skill> skills;
 
     @OneToMany
     @JoinColumn(name = "employer_id")
@@ -42,7 +42,7 @@ public void setJobs(List<Job> jobs) {
         this.jobs = jobs;
     }
     @Override
-    public Integer getId() {
+    public int getId() {
         return super.getId();
     }
 }
diff --git a/src/main/java/org/launchcode/techjobs/persistent/models/Skill.java b/src/main/java/org/launchcode/techjobs/persistent/models/Skill.java
@@ -1,26 +1,25 @@
 package org.launchcode.techjobs.persistent.models;
 
-import javax.persistence.Id;
 import javax.persistence.Entity;
 import javax.persistence.GenerationType;
-import javax.persistence.ManyToOne;
+import javax.persistence.Id;
 import javax.validation.constraints.NotBlank;
 @Entity
 public class Skill extends AbstractEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
+    private int id;
 
     @NotBlank
     private String description;
-    @ManyToOne
-    private Employer employer;
+//    @ManyToOne
+//    private Employer employer;
 
     public Skill () {
 }
 
-    public Integer getId(){
+    public int getId(){
         return id;
     }
     public String getDescription() {
@@ -30,10 +29,10 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Employer getEmployer() {
-        return employer;
-    }
-    public void setEmployer(Employer employer) {
-        this.employer = employer;
-    }
+//    public Employer getEmployer() {
+//        return employer;
+//    }
+//    public void setEmployer(Employer employer) {
+//        this.employer = employer;
+//    }
 }
diff --git a/src/main/resources/templates/add.html b/src/main/resources/templates/add.html
@@ -15,16 +15,11 @@ <h1>Add Job</h1>
     </div>
 
     <div class="form-group">
-        <label for="employer">Employer</label>
-<!--        <select name="employerId">-->
-        <select class="form-control" th:field="${job.employer}">
-            <option value="">Select an employer</option>
-            <option th:each="employer : ${employers}" th:value="${employer.id}" th:text="${employer.name}"></option>
-<!--            <option value="">Select an employer</option>-->
-<!--            <option th:each="employer : ${employers}" th:value="${employer.id}" th:text="${employer.name}"></option>-->
-<!--            <option th:each="employer : ${employers}"-->
-<!--                    th:text="${employer.name}"-->
-<!--                    th:value="${employer.id}"></option>-->
+        <label th:for="employer">Employer</label>
+        <select name="employerId">
+            <option th:each="employer : ${employers}"
+                    th:text="${employer.name}"
+                    th:value="${employer.id}"></option>
         </select>
         <a th:href="@{'/employers/add'}">Add Employers</a>
     </div>