Changeset 29c0ed0 for src/main

Timestamp:

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

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

83a5af4

Parents:

efdb71a

Message:

added initial login functionality

Location:

src/main/java/it/finki/tinki

Files:

• bootstrap/DataHolder.java (modified) (3 diffs)
• controller/TestController.java (modified) (1 diff)
• model/Users/Account.java (modified) (1 diff)
• model/pojo/AccountLoginDataPojo.java (added)
• repository/CompanyRepository.java (modified) (1 diff)
• repository/TeamRepository.java (modified) (1 diff)
• repository/UserRepository.java (modified) (1 diff)
• service/AccountService.java (added)
• service/impl/AccountServiceImpl.java (added)

src/main/java/it/finki/tinki/bootstrap/DataHolder.java

@@ -1 +1 @@
 package it.finki.tinki.bootstrap;
 
+import it.finki.tinki.model.Address;
 import it.finki.tinki.model.Skill;
-import it.finki.tinki.repository.SkillRepository;
+import it.finki.tinki.model.Users.Company;
+import it.finki.tinki.model.Users.User;
+import it.finki.tinki.model.enumerator.AccountType;
+import it.finki.tinki.repository.*;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
 
 @Component
@@ -11 +17 @@
 
     SkillRepository skillRepository;
+    UserRepository userRepository;
+    CompanyRepository companyRepository;
+    TeamRepository teamRepository;
+    AddressRepository addressRepository;
 
-    public DataHolder(SkillRepository skillRepository) {
+    public DataHolder(SkillRepository skillRepository, UserRepository userRepository, CompanyRepository companyRepository, TeamRepository teamRepository, AddressRepository addressRepository) {
         this.skillRepository = skillRepository;
+        this.userRepository = userRepository;
+        this.companyRepository = companyRepository;
+        this.teamRepository = teamRepository;
+        this.addressRepository = addressRepository;
     }
 
@@ -41 +55 @@
             skillRepository.save(s0);
         }
+
+        addressRepository.save(new Address("asdf", "asdf", "asdf"));
+        companyRepository.save(new Company("asdf@asdf", "pass", "Co.co", AccountType.COMPANY, addressRepository.findAll().get(0)));
     }
 

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

@@ -1 +1 @@
 package it.finki.tinki.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.Work;
-import it.finki.tinki.model.Skill;
+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 org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import it.finki.tinki.repository.TeamRepository;
+import it.finki.tinki.repository.UserRepository;
+import it.finki.tinki.service.AccountService;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TestController {
 
-    JobRepository jobRepository;
+    AccountService accountService;
 
-    public TestController(JobRepository jobRepository) {
-        this.jobRepository = jobRepository;
+    public TestController(AccountService accountService) {
+        this.accountService = accountService;
     }
 
-    @GetMapping
-    public String testPage(){
-        Matchmaker match = new Matchmaker();
-        List<Skill> skills = new ArrayList<>();
-
-        skills.add(new Skill("C++"));
-        skills.add(new Skill("Java"));
-        skills.add(new Skill("Python"));
-
-        List<Skill> user = new ArrayList<>();
-
-        user.add(new Skill("Java"));
-        user.add(new Skill("Python"));
-
-        System.out.println(match.match(skills, user));
-
-        return "Hello";
+    @PostMapping(path = "/login")
+    public Account testPage(@RequestBody AccountLoginDataPojo body){
+        return accountService.findUser(body.getAccount(), body.getPassword(), body.getType());
     }
 

src/main/java/it/finki/tinki/model/Users/Account.java

@@ -15 +15 @@
     Long id;
 
+    @Column(unique = true)
     String email;
+
     String password;
 

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

@@ -7 +7 @@
 @Repository
 public interface CompanyRepository extends JpaRepository<Company, Long> {
+    Company findByEmailAndPassword(String email, String password);
 }

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

@@ -7 +7 @@
 @Repository
 public interface TeamRepository extends JpaRepository<Team, Long> {
+    Team findByEmailAndPassword(String email, String password);
 }

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

@@ -7 +7 @@
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
+    User findByEmailAndPassword(String email, String password);
 }