Changeset a8e8545 for src/main/java/it/finki/tinki/model

Timestamp:

01/08/21 00:35:56 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

4cec0a3

Parents:

509cb95

Message:

added dummy data for user skills and fixed bugs

Location:

src/main/java/it/finki/tinki/model

Files:

• EmbeddedMatchId.java (modified) (2 diffs)
• Jobs/Internship.java (modified) (1 diff)
• Jobs/Job.java (modified) (1 diff)
• Jobs/Project.java (modified) (1 diff)
• Match.java (modified) (3 diffs)

src/main/java/it/finki/tinki/model/EmbeddedMatchId.java

@@ -6 +6 @@
 
 import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
 import javax.persistence.OneToOne;
 import java.io.Serializable;
+import java.util.Objects;
 
 @Embeddable
@@ -25 +27 @@
         this.user = user;
     }
-
 }

src/main/java/it/finki/tinki/model/Jobs/Internship.java

@@ -12 +12 @@
 public class Internship extends Work {
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER)
     List<Skill> skillsTrained;
 

src/main/java/it/finki/tinki/model/Jobs/Job.java

@@ -12 +12 @@
 public class Job extends Work {
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER)
     List<Skill> skillsRequired;
 

src/main/java/it/finki/tinki/model/Jobs/Project.java

@@ -13 +13 @@
 public class Project extends Work {
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER)
     List<Skill> skillsRequired;
 

src/main/java/it/finki/tinki/model/Match.java

@@ -1 +1 @@
 package it.finki.tinki.model;
 
+import com.sun.istack.NotNull;
+import it.finki.tinki.model.Jobs.Work;
+import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.enumerator.WorkType;
 import lombok.Data;
@@ -10 +13 @@
 public class Match {
 
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.AUTO)
+//    Long id;
+//
+//    @NotNull
+//    Long workId;
+//
+//    @NotNull
+//    Long userId;
+
     @Id
-    EmbeddedMatchId combinedId;
+    EmbeddedMatchId embeddedMatchId;
 
     float coefficient;
@@ -19 +32 @@
     public Match(){}
 
+//    public Match(Long workId, Long userId, float coefficient, WorkType type) {
+//        this.workId = workId;
+//        this.userId = userId;
+//        this.coefficient = coefficient;
+//        this.type = type;
+//    }
+
     public Match(EmbeddedMatchId embeddedMatchId, float coefficient, WorkType type) {
-        this.combinedId = embeddedMatchId;
+        this.embeddedMatchId = embeddedMatchId;
         this.coefficient = coefficient;
         this.type = type;