Changeset 336d09e for src/main/java/it/finki/tinki/web

Timestamp:

01/08/21 03:34:14 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

4b1c93d

Parents:

b31afbd

Message:

cleanup

Location:

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

Files:

• LoginController.java (modified) (4 diffs)
• RegisterController.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import it.finki.tinki.service.MatchmakerService;
 import it.finki.tinki.service.WorkService;
-import org.apache.coyote.Response;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
-import java.util.Map;
 
 @RestController
@@ -35 +33 @@
     }
 
+    //TODO: ADD JOB/INTERNSHIP RESPONSE TYPE TO COMPANY AND TEAM ---------------------v
+
     @PostMapping(path = "/login")
     public LoginResponseDTO testPage(@RequestBody AccountLoginDTO body) throws ResponseStatusException {
-
-        System.out.println(body);
 
         Account a1 = accountService.findUser(body.getEmail(), body.getPassword(), body.getType());
@@ -89 +87 @@
                 tDto.setEmail(a1.getEmail());
                 tDto.setName(a1.getName());
-                tDto.setType(AccountType.USER);
+                tDto.setType(AccountType.TEAM);
                 tDto.setMembers(((Team) a1).getMembers());
 
@@ -106 +104 @@
                 cDto.setEmail(a1.getEmail());
                 cDto.setName(a1.getName());
-                cDto.setType(AccountType.USER);
+                cDto.setType(AccountType.COMPANY);
                 cDto.setAddress(((Company) a1).getAddress());
 

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

@@ -1 +1 @@
 package it.finki.tinki.web.controller;
 
-import it.finki.tinki.helper.Matchmaker;
-import it.finki.tinki.model.Jobs.Internship;
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.dto.UserRegisterDTO;
 import it.finki.tinki.service.AccountService;
@@ -55 +50 @@
     }
 
+    //TODO: ADD TEAM AND COMPANY REGISTER TDO --------------------------------------v
+
     @RequestMapping(path = "/team", method = RequestMethod.POST)
     private Map<String, String> registerTeam(@RequestBody String email,