Changeset 723994f

Timestamp:

01/07/21 16:13:55 (3 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

Files:

• controller/LoginController.java (deleted)
• model/Match.java (modified) (2 diffs)
• model/dto/AccountLoginDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/pojo/AccountLoginDataPojo.java ) (2 diffs)
• model/dto/AuthResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/pojo/AuthResponseDataPojo.java ) (2 diffs)
• model/dto/CompanyResponseDTO.java (added)
• model/dto/LoginResponseDTO.java (added)
• model/dto/TeamResponseDTO.java (added)
• model/dto/UserResponseDTO.java (added)
• model/enumerator/WorkType.java (added)
• repository/MatchRepository.java (modified) (1 diff)
• service/MatchmakerService.java (added)
• service/impl/MatchmakerServiceImpl.java (added)
• web/controller/LoginController.java (added)
• web/controller/RegisterController.java (moved) (moved from src/main/java/it/finki/tinki/controller/RegisterController.java ) (1 diff)

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!";

src/main/java/it/finki/tinki/repository/MatchRepository.java

@@ -2 +2 @@
 
 import it.finki.tinki.model.Match;
+import it.finki.tinki.model.Users.User;
+import it.finki.tinki.model.enumerator.WorkType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface MatchRepository extends JpaRepository<Match, Long> {
+    List<Match> getAllByCombinedId_UserAndTypeOrderByCoefficientDesc(User user, WorkType type);
 }

src/main/java/it/finki/tinki/web/controller/RegisterController.java

@@ -1 @@
-package it.finki.tinki.controller;
+package it.finki.tinki.web.controller;
 
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.Users.User;
 import it.finki.tinki.service.AccountService;
 import it.finki.tinki.service.SkillService;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;