Changeset 83a5af4

Timestamp:

01/04/21 20:04:57 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

f36822a

Parents:

29c0ed0

Message:

added response data

Files:

• .gitignore (modified) (1 diff)
• src/main/java/it/finki/tinki/controller/TestController.java (modified) (2 diffs)
• src/main/java/it/finki/tinki/model/pojo/AuthResponseDataPojo.java (added)
• src/main/resources/application.properties (modified) (1 diff)

.gitignore

@@ -41 +41 @@
 atlassian-ide-plugin.xml
 .gradletasknamecache
+
+# Client APP

src/main/java/it/finki/tinki/controller/TestController.java

@@ -2 +2 @@
 
 import it.finki.tinki.model.Users.Account;
-import it.finki.tinki.model.Users.Company;
-import it.finki.tinki.model.Users.Team;
-import it.finki.tinki.model.Users.User;
-import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.model.pojo.AccountLoginDataPojo;
-import it.finki.tinki.repository.CompanyRepository;
-import it.finki.tinki.repository.JobRepository;
-import it.finki.tinki.repository.TeamRepository;
-import it.finki.tinki.repository.UserRepository;
+import it.finki.tinki.model.pojo.AuthResponseDataPojo;
 import it.finki.tinki.service.AccountService;
 import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.springframework.web.server.ResponseStatusException;
 
 @RestController
@@ -28 +19 @@
 
     @PostMapping(path = "/login")
-    public Account testPage(@RequestBody AccountLoginDataPojo body){
-        return accountService.findUser(body.getAccount(), body.getPassword(), body.getType());
+    public AuthResponseDataPojo testPage(@RequestBody AccountLoginDataPojo body) throws ResponseStatusException {
+        Account a1 = accountService.findUser(body.getAccount(), body.getPassword(), body.getType());
+        AuthResponseDataPojo resp = new AuthResponseDataPojo();
+
+        if(a1!=null){
+            resp.setId(a1.getId());
+            resp.setEmail(a1.getEmail());
+            resp.setName(a1.getName());
+            resp.setType(a1.getAccountType());
+        }
+
+        return resp;
     }
 

src/main/resources/application.properties

@@ -1 @@
-server.port=3000
+server.port=9090
 
 spring.datasource.url=jdbc:h2:mem:testdb