Changeset 723994f for src/main/java/it/finki/tinki/model

Timestamp:

01/07/21 16:13:55 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

509cb95

Parents:

1397178

Message:

refactoring and further login functionality

Location:

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

Files:

• Match.java (modified) (2 diffs)
• dto/AccountLoginDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/pojo/AccountLoginDataPojo.java ) (2 diffs)
• dto/AuthResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/pojo/AuthResponseDataPojo.java ) (2 diffs)
• dto/CompanyResponseDTO.java (added)
• dto/LoginResponseDTO.java (added)
• dto/TeamResponseDTO.java (added)
• dto/UserResponseDTO.java (added)
• enumerator/WorkType.java (added)

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

@@ -1 +1 @@
 package it.finki.tinki.model;
 
+import it.finki.tinki.model.enumerator.WorkType;
 import lombok.Data;
 
@@ -14 +15 @@
     float coefficient;
 
+    WorkType type;
+
     public Match(){}
 
-    public Match(float coefficient) {
+    public Match(float coefficient, WorkType type) {
         this.coefficient = coefficient;
+        this.type = type;
     }
 }

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

@@ -1 @@
-package it.finki.tinki.model.pojo;
+package it.finki.tinki.model.dto;
 
 import it.finki.tinki.model.enumerator.AccountType;
@@ -5 +5 @@
 
 @Data
-public class AccountLoginDataPojo {
-    private String account;
+public class AccountLoginDTO {
+    private String email;
     private String password;
     private AccountType type;

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

@@ -1 @@
-package it.finki.tinki.model.pojo;
+package it.finki.tinki.model.dto;
 
 import it.finki.tinki.model.enumerator.AccountType;
@@ -5 +5 @@
 
 @Data
-public class AuthResponseDataPojo {
-    Long id;
-    String email;
-    String name;
-    AccountType type;
+public class AuthResponseDTO {
+    private Long id;
+    private String email;
+    private String name;
+    private AccountType type;
 
-    public AuthResponseDataPojo() {
+    public AuthResponseDTO() {
         this.id = null;
         this.email = "Wrong username or password!";