Changeset 509cb95 for src/main/java/it/finki/tinki/model

Timestamp:

01/07/21 22:32:22 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

a8e8545

Parents:

723994f

Message:

finalized register and login and added insert options for jobs

Location:

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

Files:

• EmbeddedMatchId.java (modified) (1 diff)
• Match.java (modified) (1 diff)
• dto/LoginResponseDTO.java (modified) (1 diff)

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

@@ -18 +18 @@
     @OneToOne
     private User user;
+
+    public EmbeddedMatchId(){ }
+
+    public EmbeddedMatchId(Work work, User user){
+        this.work = work;
+        this.user = user;
+    }
+
 }

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

@@ -19 +19 @@
     public Match(){}
 
-    public Match(float coefficient, WorkType type) {
+    public Match(EmbeddedMatchId embeddedMatchId, float coefficient, WorkType type) {
+        this.combinedId = embeddedMatchId;
         this.coefficient = coefficient;
         this.type = type;

src/main/java/it/finki/tinki/model/dto/LoginResponseDTO.java

@@ -10 +10 @@
     private String name;
     private AccountType type;
+    private String error;
+
+    public LoginResponseDTO() {
+        this.error = "Invalid username or password!";
+    }
 }