From 29491995bdf43163332ced4b5e9baf9ed6d58e09 Mon Sep 17 00:00:00 2001 From: yasintorun Date: Wed, 26 May 2021 22:22:28 +0300 Subject: [PATCH 1/2] DevTwo --- api/pom.xml | 15 ++++ .../java/kodlamaio/hrms/HrmsApplication.java | 16 ++++ .../java/kodlamaio/hrms/Services/Mernis.java | 21 +++++ .../api/controllers/EmployerController.java | 38 ++++++++ .../controllers/JobPositionController.java | 13 ++- .../api/controllers/JobseekerController.java | 38 ++++++++ .../api/controllers/PersonelController.java | 39 ++++++++ .../hrms/api/controllers/UserController.java | 32 +++++++ .../hrms/business/abstracts/BaseService.java | 11 +++ .../business/abstracts/EmployerService.java | 9 ++ .../abstracts/JobPositionService.java | 8 +- .../business/abstracts/JobseekerService.java | 6 ++ .../business/abstracts/PersonelService.java | 9 ++ .../abstracts/UserRegisterService.java | 7 ++ .../hrms/business/abstracts/UserService.java | 8 ++ .../business/concretes/EmployerManager.java | 83 ++++++++++++++++++ .../concretes/JobPositionManager.java | 30 +++++-- .../business/concretes/JobseekerManager.java | 82 +++++++++++++++++ .../business/concretes/PersonelManager.java | 44 ++++++++++ .../hrms/business/concretes/UserManager.java | 53 +++++++++++ .../concretes/UserRegisterManager.java | 79 +++++++++++++++++ .../core/utilities/helpers/CheckHelper.java | 21 +++++ .../helpers/EmailVerificationSystem.java | 7 ++ .../core/utilities/results/DataResult.java | 21 +++++ .../utilities/results/ErrorDataResult.java | 20 +++++ .../core/utilities/results/ErrorResult.java | 12 +++ .../hrms/core/utilities/results/Result.java | 24 +++++ .../utilities/results/SuccessDataResult.java | 20 +++++ .../core/utilities/results/SuccessResult.java | 12 +++ .../dataAccess/abstracts/EmployerDao.java | 10 +++ .../dataAccess/abstracts/JobPositionDao.java | 1 + .../dataAccess/abstracts/JobseekerDao.java | 10 +++ .../dataAccess/abstracts/PersonelDao.java | 9 ++ .../hrms/dataAccess/abstracts/UserDao.java | 9 ++ .../dataAccess/abstracts/UserRegisterDao.java | 9 ++ .../hrms/entities/concretes/Employer.java | 31 +++++++ .../hrms/entities/concretes/JobPosition.java | 2 +- .../hrms/entities/concretes/Jobseeker.java | 29 ++++++ .../hrms/entities/concretes/Personel.java | 25 ++++++ .../hrms/entities/concretes/User.java | 34 +++++++ .../hrms/entities/concretes/UserRegister.java | 41 +++++++++ .../maven/kodlamaio/hrms/pom.properties | 2 +- .../META-INF/maven/kodlamaio/hrms/pom.xml | 15 ++++ .../kodlamaio/hrms/HrmsApplication.class | Bin 729 -> 1711 bytes .../controllers/JobPositionController.class | Bin 1293 -> 1781 bytes .../abstracts/JobPositionService.class | Bin 300 -> 341 bytes .../concretes/JobPositionManager.class | Bin 1121 -> 2276 bytes .../dataAccess/abstracts/JobPositionDao.class | Bin 370 -> 471 bytes .../hrms/entities/concretes/JobPosition.class | Bin 2210 -> 2276 bytes 49 files changed, 986 insertions(+), 19 deletions(-) create mode 100644 api/src/main/java/kodlamaio/hrms/Services/Mernis.java create mode 100644 api/src/main/java/kodlamaio/hrms/api/controllers/EmployerController.java create mode 100644 api/src/main/java/kodlamaio/hrms/api/controllers/JobseekerController.java create mode 100644 api/src/main/java/kodlamaio/hrms/api/controllers/PersonelController.java create mode 100644 api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/BaseService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/EmployerService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/JobseekerService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/PersonelService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/UserRegisterService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/abstracts/UserService.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/concretes/EmployerManager.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/concretes/JobseekerManager.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/concretes/PersonelManager.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/concretes/UserManager.java create mode 100644 api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/helpers/CheckHelper.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/helpers/EmailVerificationSystem.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/DataResult.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorDataResult.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorResult.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/Result.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessDataResult.java create mode 100644 api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessResult.java create mode 100644 api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/EmployerDao.java create mode 100644 api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobseekerDao.java create mode 100644 api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/PersonelDao.java create mode 100644 api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserDao.java create mode 100644 api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserRegisterDao.java create mode 100644 api/src/main/java/kodlamaio/hrms/entities/concretes/Employer.java create mode 100644 api/src/main/java/kodlamaio/hrms/entities/concretes/Jobseeker.java create mode 100644 api/src/main/java/kodlamaio/hrms/entities/concretes/Personel.java create mode 100644 api/src/main/java/kodlamaio/hrms/entities/concretes/User.java create mode 100644 api/src/main/java/kodlamaio/hrms/entities/concretes/UserRegister.java diff --git a/api/pom.xml b/api/pom.xml index 2573484..7079c05 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -47,6 +47,21 @@ spring-boot-starter-test test + + + io.springfox + springfox-swagger2 + 2.9.2 + + + + + + io.springfox + springfox-swagger-ui + 2.9.2 + + diff --git a/api/src/main/java/kodlamaio/hrms/HrmsApplication.java b/api/src/main/java/kodlamaio/hrms/HrmsApplication.java index 452006b..026a120 100644 --- a/api/src/main/java/kodlamaio/hrms/HrmsApplication.java +++ b/api/src/main/java/kodlamaio/hrms/HrmsApplication.java @@ -2,12 +2,28 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication +@EnableSwagger2 public class HrmsApplication { public static void main(String[] args) { SpringApplication.run(HrmsApplication.class, args); } + + @Bean + public Docket api() { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.basePackage("kodlamaio.hrms")) + .build(); + } + } diff --git a/api/src/main/java/kodlamaio/hrms/Services/Mernis.java b/api/src/main/java/kodlamaio/hrms/Services/Mernis.java new file mode 100644 index 0000000..b79f21f --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/Services/Mernis.java @@ -0,0 +1,21 @@ +package kodlamaio.hrms.Services; + +import kodlamaio.hrms.core.utilities.results.DataResult; + +import kodlamaio.hrms.core.utilities.results.ErrorDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.entities.concretes.Jobseeker; + +public class Mernis { + + public static DataResult Validate(Jobseeker jobseeker) { + + if(jobseeker.getTcNo().length() != 11) { + return new ErrorDataResult("Tc kimlik numarası hatalı!"); + } + + return new SuccessDataResult("Mernis doğrulaması başarılı!"); + } + + +} diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/EmployerController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/EmployerController.java new file mode 100644 index 0000000..2fc1937 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/EmployerController.java @@ -0,0 +1,38 @@ +package kodlamaio.hrms.api.controllers; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import kodlamaio.hrms.business.abstracts.EmployerService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.entities.concretes.Employer; + +@RestController +@RequestMapping("/api/employers") +public class EmployerController { + private EmployerService employerService; + + @Autowired + public EmployerController(EmployerService employerService) { + super(); + this.employerService = employerService; + } + + @GetMapping("/getAllEmployer") + public DataResult> getAll() { + return this.employerService.getAll(); + } + + + @PostMapping("/add") + public Result add(@RequestBody Employer employer) { + return this.employerService.add(employer); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/JobPositionController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/JobPositionController.java index f2d4452..6bd796b 100644 --- a/api/src/main/java/kodlamaio/hrms/api/controllers/JobPositionController.java +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/JobPositionController.java @@ -4,10 +4,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import kodlamaio.hrms.business.abstracts.JobPositionService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; import kodlamaio.hrms.entities.concretes.JobPosition; @RestController @@ -22,12 +26,13 @@ public JobPositionController(JobPositionService jobPositionService) { } @GetMapping("/getAllJobs") - public List getAll() { + public DataResult> getAll() { return this.jobPositionService.getAll(); } - @GetMapping("/get") - public long get() { - return this.jobPositionService.test(); + + @PostMapping("/add") + public Result add(@RequestBody JobPosition jobPosition) { + return this.jobPositionService.add(jobPosition); } } diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/JobseekerController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/JobseekerController.java new file mode 100644 index 0000000..7772793 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/JobseekerController.java @@ -0,0 +1,38 @@ +package kodlamaio.hrms.api.controllers; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import kodlamaio.hrms.business.abstracts.JobseekerService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.entities.concretes.Jobseeker; + +@RestController +@RequestMapping("/api/jobseekers") +public class JobseekerController { + private JobseekerService jobseekerService; + + @Autowired + public JobseekerController(JobseekerService jobseekerService) { + super(); + this.jobseekerService = jobseekerService; + } + + @GetMapping("/getAllJobseekers") + public DataResult> getAll() { + return this.jobseekerService.getAll(); + } + + + @PostMapping("/add") + public Result add(@RequestBody Jobseeker jobseeker) { + return this.jobseekerService.add(jobseeker); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/PersonelController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/PersonelController.java new file mode 100644 index 0000000..0922318 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/PersonelController.java @@ -0,0 +1,39 @@ +package kodlamaio.hrms.api.controllers; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import kodlamaio.hrms.business.abstracts.PersonelService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.entities.concretes.Personel; + +@RestController +@RequestMapping("/api/personels") +public class PersonelController { + private PersonelService personelService; + + @Autowired + public PersonelController(PersonelService personelService) { + super(); + this.personelService = personelService; + } + + @GetMapping("/getAllUsers") + public DataResult> getAll() { + return this.personelService.getAll(); + } + + + @PostMapping("/add") + public Result add(@RequestBody Personel personel) { + return this.personelService.add(personel); + } + +} diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java new file mode 100644 index 0000000..fd55fc1 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java @@ -0,0 +1,32 @@ +package kodlamaio.hrms.api.controllers; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import kodlamaio.hrms.business.abstracts.UserService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.entities.concretes.User; +import kodlamaio.hrms.core.utilities.results.Result; + +@RestController +@RequestMapping("/api/users") +public class UserController { + private UserService userService; + + @Autowired + public UserController(UserService userService) { + super(); + this.userService = userService; + } + + @GetMapping("/getAllUsers") + public DataResult> getAll() { + return this.userService.getAll(); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/BaseService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/BaseService.java new file mode 100644 index 0000000..314dc1d --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/BaseService.java @@ -0,0 +1,11 @@ +package kodlamaio.hrms.business.abstracts; + +import java.util.List; + +import kodlamaio.hrms.core.utilities.results.DataResult; + +import kodlamaio.hrms.core.utilities.results.Result; +public interface BaseService { + public DataResult> getAll(); + public Result add(T entity); +} diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/EmployerService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/EmployerService.java new file mode 100644 index 0000000..744f316 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/EmployerService.java @@ -0,0 +1,9 @@ +package kodlamaio.hrms.business.abstracts; + +import kodlamaio.hrms.entities.concretes.Employer; + +public interface EmployerService extends BaseService{ + +} + + diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/JobPositionService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/JobPositionService.java index d4cbf9e..b6b3700 100644 --- a/api/src/main/java/kodlamaio/hrms/business/abstracts/JobPositionService.java +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/JobPositionService.java @@ -1,13 +1,7 @@ package kodlamaio.hrms.business.abstracts; -import java.util.List; - import kodlamaio.hrms.entities.concretes.JobPosition; -public interface JobPositionService { - List getAll(); - - long test(); - +public interface JobPositionService extends BaseService{ } diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/JobseekerService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/JobseekerService.java new file mode 100644 index 0000000..79ce4e0 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/JobseekerService.java @@ -0,0 +1,6 @@ +package kodlamaio.hrms.business.abstracts; + +import kodlamaio.hrms.entities.concretes.Jobseeker; + +public interface JobseekerService extends BaseService{ +} diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/PersonelService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/PersonelService.java new file mode 100644 index 0000000..f2db1b6 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/PersonelService.java @@ -0,0 +1,9 @@ +package kodlamaio.hrms.business.abstracts; + +import kodlamaio.hrms.entities.concretes.Personel; + +public interface PersonelService extends BaseService{ + +} + + diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/UserRegisterService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/UserRegisterService.java new file mode 100644 index 0000000..f8bd6b7 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/UserRegisterService.java @@ -0,0 +1,7 @@ +package kodlamaio.hrms.business.abstracts; + +import kodlamaio.hrms.entities.concretes.UserRegister; + +public interface UserRegisterService extends BaseService{ + +} diff --git a/api/src/main/java/kodlamaio/hrms/business/abstracts/UserService.java b/api/src/main/java/kodlamaio/hrms/business/abstracts/UserService.java new file mode 100644 index 0000000..b940c64 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/abstracts/UserService.java @@ -0,0 +1,8 @@ +package kodlamaio.hrms.business.abstracts; + +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.entities.concretes.User; + +public interface UserService extends BaseService{ + public Result Verify(int userId, String code); +} diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/EmployerManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/EmployerManager.java new file mode 100644 index 0000000..8d9ea07 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/EmployerManager.java @@ -0,0 +1,83 @@ +package kodlamaio.hrms.business.concretes; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import kodlamaio.hrms.business.abstracts.EmployerService; +import kodlamaio.hrms.core.utilities.helpers.CheckHelper; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.ErrorDataResult; +import kodlamaio.hrms.core.utilities.results.ErrorResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessResult; +import kodlamaio.hrms.dataAccess.abstracts.EmployerDao; +import kodlamaio.hrms.entities.concretes.Employer; +import kodlamaio.hrms.entities.concretes.User; +@Service +public class EmployerManager implements EmployerService{ + private EmployerDao employerDao; + private UserManager userManager; + @Autowired + public EmployerManager(EmployerDao employerDao, UserManager userManager) { + this.employerDao = employerDao; + this.userManager = userManager; + } + + @Override + public DataResult> getAll() { + return new SuccessDataResult> + (this.employerDao.findAll()); + } + + @Override + public Result add(Employer entity) { + + + if(isNull(entity)) { + return new ErrorDataResult("Tüm alanları doldurunuz!"); + } + + if(!CheckHelper.emailCheck(entity.getEposta())) { + return new ErrorResult("E-posta hatalı!"); + } + + /*if(!entity.getEposta().matches("^[\\w!#$%&'*+/=?`{|}~^-]+(?:\\.[\\w!#$%&'*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$")) { + return new ErrorResult("E-posta hatalı!"); + }*/ + + //Todo: Burayı Düzenle. + String domain = entity.getEposta().split("@")[1]; + if(!domain.startsWith(entity.getCompanyName())) { + return new ErrorResult("Lütfen şirket adınıza kayıtlı e posta kullanınız!"); + } + + + if(isExist(entity)) { + return new ErrorResult("E posta kayıtlı!"); + } + + + DataResult result = (DataResult) userManager.add((User)entity); + if(result.isSuccess()) { + entity.setUserId(result.getData().getUserId()); + this.employerDao.save(entity); + return new SuccessResult("İş Veren eklendi"); + } + + return new ErrorResult("Kayıt başarısız!"); + + } + private boolean isNull(Employer entity) { + return (entity.getEposta().isEmpty() || entity.getCompanyName().isEmpty() || entity.getPassword().isEmpty() || entity.getPhone().isEmpty() || entity.getWebsite().isEmpty()); + } + + private boolean isExist(Employer entity) { + return employerDao.existsUserByEposta(entity.getEposta()); + } + + + +} diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/JobPositionManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/JobPositionManager.java index 6adb915..8341859 100644 --- a/api/src/main/java/kodlamaio/hrms/business/concretes/JobPositionManager.java +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/JobPositionManager.java @@ -6,6 +6,11 @@ import org.springframework.stereotype.Service; import kodlamaio.hrms.business.abstracts.JobPositionService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.ErrorResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessResult; import kodlamaio.hrms.dataAccess.abstracts.JobPositionDao; import kodlamaio.hrms.entities.concretes.JobPosition; @@ -26,14 +31,27 @@ public JobPositionManager(JobPositionDao jobPositionDao) { @Override - public List getAll() { - // TODO Auto-generated method stub - return this.jobPositionDao.findAll(); + public DataResult> getAll() { + return new SuccessDataResult> + (this.jobPositionDao.findAll()); } - + + + + @Override - public long test() { + public Result add(JobPosition entity) { - return this.jobPositionDao.count(); + if(isExist(entity)) { + return new ErrorResult("İş Pozisyonu zaten ekli!"); + } + + this.jobPositionDao.save(entity); + return new SuccessResult("Meslek eklendi"); + } + + private boolean isExist(JobPosition entity) { + return jobPositionDao.existsJobPositionByJobName(entity.getJobName()); } + } diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/JobseekerManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/JobseekerManager.java new file mode 100644 index 0000000..73c4c6e --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/JobseekerManager.java @@ -0,0 +1,82 @@ +package kodlamaio.hrms.business.concretes; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import kodlamaio.hrms.Services.Mernis; +import kodlamaio.hrms.business.abstracts.JobseekerService; +import kodlamaio.hrms.core.utilities.helpers.CheckHelper; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.ErrorDataResult; +import kodlamaio.hrms.core.utilities.results.ErrorResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessResult; +import kodlamaio.hrms.dataAccess.abstracts.JobseekerDao; +import kodlamaio.hrms.entities.concretes.Employer; +import kodlamaio.hrms.entities.concretes.Jobseeker; +import kodlamaio.hrms.entities.concretes.User; + +@Service +public class JobseekerManager implements JobseekerService{ + + private JobseekerDao jobseekerDao; + private UserManager userManager; + @Autowired + public JobseekerManager(JobseekerDao jobseekerDao, UserManager userManager) { + this.jobseekerDao = jobseekerDao; + this.userManager = userManager; + } + + @Override + public DataResult> getAll() { + return new SuccessDataResult> + (this.jobseekerDao.findAll()); + } + + @Override + public Result add(Jobseeker entity) { + + if(isNull(entity)) { + return new ErrorDataResult("Tüm alanları doldurunuz!"); + } + + if(!CheckHelper.emailCheck(entity.getEposta())) { + return new ErrorResult("Eposta Hatalı!"); + } + + + DataResult result = Mernis.Validate(entity); + if(!result.isSuccess()) { + return result; + } + + if(isExist(entity)) { + return new ErrorResult("Tc no veya eposta kayıtlı!"); + } + + DataResult userResult = (DataResult) userManager.add((User)entity); + if(userResult.isSuccess()) { + entity.setUserId(userResult.getData().getUserId()); + this.jobseekerDao.save(entity); + return new SuccessResult("İş Arayan eklendi"); + } + + return new ErrorResult("Kayıt Başarısız!"); + } + + + private boolean isNull(Jobseeker entity) { + return (entity.getEposta().isEmpty() || entity.getFirstname().isEmpty() || entity.getPassword().isEmpty() || entity.getLastname().isEmpty() || entity.getTcNo().isEmpty()); + } + + + private boolean isExist(Jobseeker entity) { + return jobseekerDao.existsJobseekerByTcNo(entity.getTcNo()) || jobseekerDao.existsUserByEposta(entity.getEposta()); + } + + + +} diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/PersonelManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/PersonelManager.java new file mode 100644 index 0000000..6f92060 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/PersonelManager.java @@ -0,0 +1,44 @@ +package kodlamaio.hrms.business.concretes; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import kodlamaio.hrms.business.abstracts.PersonelService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessResult; +import kodlamaio.hrms.dataAccess.abstracts.PersonelDao; +import kodlamaio.hrms.entities.concretes.Personel; + +@Service +public class PersonelManager implements PersonelService { + + private PersonelDao personelDao; + + @Autowired + public PersonelManager(PersonelDao personelDao) { + super(); + this.personelDao = personelDao; + } + + @Override + public DataResult> getAll() { + return new SuccessDataResult> + (this.personelDao.findAll()); + } + + @Override + public Result add(Personel entity) { + this.personelDao.save(entity); + + + + return new SuccessResult("Sistem Personeli eklendi"); + } + + + +} diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/UserManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/UserManager.java new file mode 100644 index 0000000..e835fb7 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/UserManager.java @@ -0,0 +1,53 @@ +package kodlamaio.hrms.business.concretes; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import kodlamaio.hrms.business.abstracts.UserService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessDataResult; +import kodlamaio.hrms.core.utilities.results.SuccessResult; +import kodlamaio.hrms.dataAccess.abstracts.UserDao; +import kodlamaio.hrms.entities.concretes.User; + +@Service +public class UserManager implements UserService { + + private UserDao userDao; + private UserRegisterManager userRegisterManager; + @Autowired + public UserManager(UserDao userDao, UserRegisterManager userRegisterManager) { + super(); + this.userDao = userDao; + this.userRegisterManager = userRegisterManager; + } + + @Override + public DataResult> getAll() { + return new SuccessDataResult> + (this.userDao.findAll()); + } + + @Override + public Result add(User entity) { + + this.userDao.save(entity); + userRegisterManager.NewRegister(entity); + + return new SuccessDataResult(entity, "Kullanıcı eklendi"); + } + + @Override + public Result Verify(int userId, String code) { + return userRegisterManager.Verify(userId, code); + } + + + + + + +} diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java new file mode 100644 index 0000000..cab0ee2 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java @@ -0,0 +1,79 @@ +package kodlamaio.hrms.business.concretes; + +import java.util.Date; +import java.util.List; +import java.util.Random; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import kodlamaio.hrms.business.abstracts.UserRegisterService; +import kodlamaio.hrms.core.utilities.results.DataResult; +import kodlamaio.hrms.core.utilities.results.ErrorResult; +import kodlamaio.hrms.core.utilities.results.Result; +import kodlamaio.hrms.core.utilities.results.SuccessResult; +import kodlamaio.hrms.dataAccess.abstracts.UserRegisterDao; +import kodlamaio.hrms.entities.concretes.User; +import kodlamaio.hrms.entities.concretes.UserRegister; + +@Service +public class UserRegisterManager implements UserRegisterService { + + private UserRegisterDao userRegisterDao; + + @Autowired + public UserRegisterManager(UserRegisterDao userRegisterDao) { + this.userRegisterDao = userRegisterDao; + } + + @Override + public DataResult> getAll() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Result add(UserRegister entity) { + userRegisterDao.save(entity); + + return new SuccessResult("Kayıt oluşturuldu!"); + } + + + public Result NewRegister(User user) { + UserRegister userRegister = new UserRegister(); + + userRegister.setUserId(user.getUserId()); + userRegister.setComfirmed(false); + + + Random rand = new Random(); + String code = String.format("%04d", 1000+ rand.nextInt(9000)); + userRegister.setActivisionCode(code); + userRegister.setRegisterDate(new Date()); + return this.add(userRegister); + + } + + public Result Verify(int userId, String code) { + List registers = userRegisterDao.findAll(); + + for(UserRegister register : registers) { + if(register.getUserId() == userId) { + if(register.getActivisionCode().equals(code)) { + register.setComfirmed(true); + register.setComfirmedDate(new Date()); + userRegisterDao.save(register); + return new SuccessResult("Kullanıcı aktivasyon tamamlandı!"); + } + else { + return new ErrorResult("Aktivasyon kodu hatalı!"); + } + } + } + + return new ErrorResult("Kullanıcı bulunamadı!"); + } + + +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/CheckHelper.java b/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/CheckHelper.java new file mode 100644 index 0000000..3e6796a --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/CheckHelper.java @@ -0,0 +1,21 @@ +package kodlamaio.hrms.core.utilities.helpers; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class CheckHelper { + + public static boolean emailCheck(String email) { + String regex = "^[\\w!#$%&'*+/=?`{|}~^-]+(?:\\.[\\w!#$%&'*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(email); + if(!matcher.matches()) { + return false; + } + + + //Başka mail kontrolü olacaksa buraya yaz. + + return true; + } +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/EmailVerificationSystem.java b/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/EmailVerificationSystem.java new file mode 100644 index 0000000..6ca753a --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/helpers/EmailVerificationSystem.java @@ -0,0 +1,7 @@ +package kodlamaio.hrms.core.utilities.helpers; + +public class EmailVerificationSystem { + + + +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/DataResult.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/DataResult.java new file mode 100644 index 0000000..a0a8660 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/DataResult.java @@ -0,0 +1,21 @@ +package kodlamaio.hrms.core.utilities.results; + +public class DataResult extends Result{ + + private T data; + + public DataResult(T data, boolean success, String message) { + super(success, message); + this.data = data; + } + + public DataResult(T data, boolean success) { + super(success); + this.data = data; + } + + public T getData() { + return this.data; + } + +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorDataResult.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorDataResult.java new file mode 100644 index 0000000..a5f39c0 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorDataResult.java @@ -0,0 +1,20 @@ +package kodlamaio.hrms.core.utilities.results; + +public class ErrorDataResult extends DataResult{ + + public ErrorDataResult(T data, String message) { + super(data, false, message); + } + + public ErrorDataResult(T data) { + super(data, false); + } + + public ErrorDataResult(String message) { + super(null, false, message); + } + + public ErrorDataResult() { + super(null, false); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorResult.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorResult.java new file mode 100644 index 0000000..15dbe55 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/ErrorResult.java @@ -0,0 +1,12 @@ +package kodlamaio.hrms.core.utilities.results; + +public class ErrorResult extends Result{ + public ErrorResult() { + super(false); + } + + + public ErrorResult(String message) { + super(false, message); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/Result.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/Result.java new file mode 100644 index 0000000..69b031e --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/Result.java @@ -0,0 +1,24 @@ +package kodlamaio.hrms.core.utilities.results; + +public class Result { + private boolean success; + private String message; + + public Result(boolean success) { + this.success = success; + } + + public Result(boolean success, String message) { + this(success); + this.message = message; + } + + public boolean isSuccess() { + return this.success; + } + + public String getMessage() { + return this.message; + } + +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessDataResult.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessDataResult.java new file mode 100644 index 0000000..7d186cf --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessDataResult.java @@ -0,0 +1,20 @@ +package kodlamaio.hrms.core.utilities.results; + +public class SuccessDataResult extends DataResult{ + + public SuccessDataResult(T data, String message) { + super(data, true, message); + } + + public SuccessDataResult(T data) { + super(data, true); + } + + public SuccessDataResult(String message) { + super(null, true, message); + } + + public SuccessDataResult() { + super(null, true); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessResult.java b/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessResult.java new file mode 100644 index 0000000..4fecb95 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/core/utilities/results/SuccessResult.java @@ -0,0 +1,12 @@ +package kodlamaio.hrms.core.utilities.results; + +public class SuccessResult extends Result{ + public SuccessResult() { + super(true); + } + + + public SuccessResult(String message) { + super(true, message); + } +} diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/EmployerDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/EmployerDao.java new file mode 100644 index 0000000..d20e68f --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/EmployerDao.java @@ -0,0 +1,10 @@ +package kodlamaio.hrms.dataAccess.abstracts; + +import org.springframework.data.jpa.repository.JpaRepository; + +import kodlamaio.hrms.entities.concretes.Employer; + + +public interface EmployerDao extends JpaRepository{ + boolean existsUserByEposta(String eposta); +} diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.java index bfc5e7a..a64c7d0 100644 --- a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.java +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.java @@ -7,4 +7,5 @@ public interface JobPositionDao extends JpaRepository { + boolean existsJobPositionByJobName(String jobName); } diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobseekerDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobseekerDao.java new file mode 100644 index 0000000..32778d9 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/JobseekerDao.java @@ -0,0 +1,10 @@ +package kodlamaio.hrms.dataAccess.abstracts; + +import org.springframework.data.jpa.repository.JpaRepository; + +import kodlamaio.hrms.entities.concretes.Jobseeker; + +public interface JobseekerDao extends JpaRepository{ + boolean existsJobseekerByTcNo(String tcno); + boolean existsUserByEposta(String eposta); +} diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/PersonelDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/PersonelDao.java new file mode 100644 index 0000000..ac32345 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/PersonelDao.java @@ -0,0 +1,9 @@ +package kodlamaio.hrms.dataAccess.abstracts; + +import org.springframework.data.jpa.repository.JpaRepository; + +import kodlamaio.hrms.entities.concretes.Personel; + +public interface PersonelDao extends JpaRepository{ + +} diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserDao.java new file mode 100644 index 0000000..ad4f27c --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserDao.java @@ -0,0 +1,9 @@ + package kodlamaio.hrms.dataAccess.abstracts; + +import org.springframework.data.jpa.repository.JpaRepository; + +import kodlamaio.hrms.entities.concretes.User; + +public interface UserDao extends JpaRepository{ + +} diff --git a/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserRegisterDao.java b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserRegisterDao.java new file mode 100644 index 0000000..63b610a --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/dataAccess/abstracts/UserRegisterDao.java @@ -0,0 +1,9 @@ +package kodlamaio.hrms.dataAccess.abstracts; + +import org.springframework.data.jpa.repository.JpaRepository; + +import kodlamaio.hrms.entities.concretes.UserRegister; + +public interface UserRegisterDao extends JpaRepository{ + +} diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/Employer.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/Employer.java new file mode 100644 index 0000000..27259ed --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/Employer.java @@ -0,0 +1,31 @@ +package kodlamaio.hrms.entities.concretes; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(callSuper = false) +@Entity +@Table(name="employers") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Employer extends User{ + + @Column(name="company_name") + private String companyName; + + @Column(name="website") + private String website; + + @Column(name="phone") + private String phone; + + @Column(name="is_comfirmed") + private boolean isComfirmed; +} diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/JobPosition.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/JobPosition.java index 215b5ff..f21df0e 100644 --- a/api/src/main/java/kodlamaio/hrms/entities/concretes/JobPosition.java +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/JobPosition.java @@ -11,7 +11,7 @@ public class JobPosition { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") private int id; diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/Jobseeker.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/Jobseeker.java new file mode 100644 index 0000000..29ec442 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/Jobseeker.java @@ -0,0 +1,29 @@ +package kodlamaio.hrms.entities.concretes; + + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(callSuper = false) +@Entity +@Table(name="jobseekers") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Jobseeker extends User{ + + @Column(name="firstname") + private String firstname; + + @Column(name="lastname") + private String lastname; + + @Column(name="tc_no") + private String tcNo; +} diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/Personel.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/Personel.java new file mode 100644 index 0000000..f12726b --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/Personel.java @@ -0,0 +1,25 @@ +package kodlamaio.hrms.entities.concretes; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(callSuper = false) +@Entity +@Table(name="personels") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Personel extends User{ + + @Column(name="firstname") + private String firstname; + + @Column(name="lastname") + private String lastname; +} diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/User.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/User.java new file mode 100644 index 0000000..2adc1e9 --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/User.java @@ -0,0 +1,34 @@ +package kodlamaio.hrms.entities.concretes; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.InheritanceType; +@Entity +@Table(name="users") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Inheritance(strategy = InheritanceType.JOINED) +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="user_id") + private int userId; + + @Column(name="eposta") + private String eposta; + + @Column(name="password") + private String password; +} diff --git a/api/src/main/java/kodlamaio/hrms/entities/concretes/UserRegister.java b/api/src/main/java/kodlamaio/hrms/entities/concretes/UserRegister.java new file mode 100644 index 0000000..0ce594e --- /dev/null +++ b/api/src/main/java/kodlamaio/hrms/entities/concretes/UserRegister.java @@ -0,0 +1,41 @@ +package kodlamaio.hrms.entities.concretes; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Entity +@Table(name="user_registers") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UserRegister { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="id") + private int id; + + @Column(name="user_id") + private int userId; + + @Column(name="activision_code") + private String activisionCode; + + @Column(name="is_comfirmed") + private boolean isComfirmed; + + @Column(name="comfirmed_date") + private Date comfirmedDate; + + @Column(name="register_date") + private Date registerDate; +} \ No newline at end of file diff --git a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties index 2b8dbcc..5edbb68 100644 --- a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties +++ b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Fri May 14 16:18:08 TRT 2021 +#Wed May 26 21:09:48 TRT 2021 m2e.projectLocation=D\:\\JavaKamp\\hrms m2e.projectName=hrms groupId=kodlamaio diff --git a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.xml b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.xml index 2573484..7079c05 100644 --- a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.xml +++ b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.xml @@ -47,6 +47,21 @@ spring-boot-starter-test test + + + io.springfox + springfox-swagger2 + 2.9.2 + + + + + + io.springfox + springfox-swagger-ui + 2.9.2 + + diff --git a/api/target/classes/kodlamaio/hrms/HrmsApplication.class b/api/target/classes/kodlamaio/hrms/HrmsApplication.class index cb2996d072a2e8e357708f74dd34ab5a11ec85af..8959dd9d228f710156bae4e6fec12a3942fcfb98 100644 GIT binary patch literal 1711 zcmb7EZBr955Prg2p;S>o1QZ2d3o21mPzz{5)DKk|>cBXDaMEi$BG;tm?nM8U`T-rC z@dx;$95>fWs}>wSTsGP4KKpELcYpl+`W?U=@+q`2oZ2$wKvaY>eA8A!{)m=*wHhc- zM9SzCIv9?;7H1yCj75Dcyk<$n?sOWwdF^tHRNaq$R_4QB@2#vy+8-M&=za8!xU% z9VNe~o+;m!C0-3;U+IwFH{OFnT0(Igs`@dYHist~2zOL?~BhH#wp!}N91m?c321fyhp zg7z-xNs2d07;Rr3bq8?YiqZK`1n$>!-MId%8nl976#|d2jqs8uFi(N752Wev`s2F!q zX4?eLazVzR8^2Zbqh>28Me3rw_R9p&MJN|yi) zZ~16OA|y5iCQL&NW`a@E>t-N@Uy}raJ`UqBfjdDNS!Bg99!4~eHhT(0!2&E|E=n-5 zgh2vr4-8xw7oK3G_zcSi+#@t#4E-Py0jt6plYQFvjIg)>MT&$p9u5#hVbw~{ul8oA M5U(K)N&WfjU*rOk=>Px# delta 266 zcmey$+snmu>ff$?3=9nB3_2UR9x$p1X=wUnC6*=XmzHGa==)?Amsm40a0X|l=Ovbu z7Ns&WIBRH5PGWLoW@Ip#ypUOQ@sdwCcbfg~4$FoOt?W@J!gP-0*Ls$pQ@ z1M;MRSUQ@4v6w-bfg31h0+a)**V@9szmq|Qkzp-Rl!-wQNV0)tb>q+6P_J3?l`gS&R(KK+FoXfq{XEfgMb8 JFmQrtE&y!I9?}2+ delta 149 zcmcc0w1$c6)W2Q(7#JAL8F(jh1=uk%u%)M#IOgOqG6-pC`eY@RCF+-!WajAmWEPiL zGcs@nXQt;RmXsEyGBP-0D45L5XvE9Nz*3T0T*An}tfA>Ou~%J>jgbM!0ouX9z{JAH bz{-i{Cj%Fd&B(wF7U2N^kv|>h diff --git a/api/target/classes/kodlamaio/hrms/business/concretes/JobPositionManager.class b/api/target/classes/kodlamaio/hrms/business/concretes/JobPositionManager.class index 039d6878fec5a0fe534620ff1b38734c150cd870..e1327920ca745fdbbc734d67b8fc3d96195095af 100644 GIT binary patch literal 2276 zcmbVNT~k{{7=AWTLeh{zY}F!FkXrH~9HF(KP&9n0HBhE;aOjP*Ia$I&a+cY%0qH;S z%0J)*&L|8rg8tcf-0%TiV3Jx>{KllK{>3QAWTe@9ENvY~lR>?ytNlmz#DXM>Vcdf(xV z4Nksp)SlF$Ow2mxRawN*fg1_L(96(~&aB12kV+tmZiX8L5`Lv#D+&D_r@-{2pj=*E z<67Ez_-Citl*Hs=dwN$Y9P#K~7G_hGSGlEcgeI)6iZJLgBQJ+OI#xUL{*Cm24 zYOVAsfo^=l(Er!L-#-tos^`+*S6+SaIXA)^6x&rf6vrqgtWx*elqwqAbflCm)~5+P z#3VJ9&v(gm_b!t3WtF4&jN$&(D2E<7BTX((E(^aZwk=KJm1P`Ln4sPX%CpblyryXx zdWwd-+sk|>=e>}c(jIm1v``6OGGn%f z7}6IWxjvm-LYe&?;e_vyX$+CIJLtMbSHzyF^qRBd80@ioon~D$OVGWCt|eL%p?f@g zgk(1NJNka5Sp;vnZ05;|CT#cZ>%Se1C$e_0;D_n6Y6xf}~Ou0MuRG7()uwhC^)W2Q(7#JAL88kO?2{BDhVip!;WZ(?WOwUU!DJ@E6WN_BdoIHiek%OB- zmO-AKL2j}Pv$>7}gCrvZds=2*iepX=BLhoGYHesnbVlaM@7b(5MHyHa#27dk#3viG+tiydFajY11DDno2Em;SGK>rxfIKD!VIau{ zmXT)=0kU}@su)CpdKrLhMFu4x$qQtg097NIpv=gy7AT5rf+`jhm>ASRs`wbx8MuKA JkX0HC3;^d6Bb5LE diff --git a/api/target/classes/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.class b/api/target/classes/kodlamaio/hrms/dataAccess/abstracts/JobPositionDao.class index 5dbb6a4ddbfa5e5d07dd4445211c1b7e44f624af..f566d28d74cb3b324c9773be6f62c98ccb9bdd1e 100644 GIT binary patch delta 141 zcmeywbe);&)W2Q(7#JAL8Tco1bq7eLR%8~J6no_-1>_fJmSpDVIaLBVeu=rMj0~b0 zK3R!niTXK-dFlGWB}JKe>DHQ2j125qFckv6sU;ctDFKN^Kn*3SMa2^*pHX9E0V-kO bU|?k60$Rk%$iNAtm>9UhBo6~GnC1fjz&0d) delta 41 scmcc4{E3O{)W2Q(7#JAL8Mr5Mbx(YLN|=FxiGdv`!oEk7i~=m7VgbN8I@p7Wh^E`R*}(@Oxiu$e$iVe*Mv zsabW)cJtLn-OFpow|!fC`LgSj8``Jz(A_Gz9#35-0Yjl@$NJjJ*DPl{zp}NX%f3R) zt|+LYLjP)$0Cl}#d-hgM&pD3kTjJ>{^eu|xH~C%N@NCc5PFd%Rm4d=Ziw_U9qZ^j5 zD;rj=scDq-e9^b}&a~%E>wCL_eevGH@_KQ7Q{hqz{CT(5tUJUt9ILJs5oC7HzhOJuayvgi3N71bY{&NRD70m=8}y%dD>{WX^qENG4TbJS+tJI-`j&32TjW3? zz37&$+J@DzMUM^*ziN||{Nn#A07L1^6i-K(-8ct@%O>Jz7wL+LZuGELOWLoxm6Fw9 zZa#@uh;M7Z$Z|1!7A!@L1rAfckjb8griT}L7@4AEoT7T@(wjN$Ax7=`tEN@sbteqM zeko+XOfkj@6O+i1+p^^>h_xK%O}vE>k#3l{icw+qJrh|mRIYIO@9rZdao4ZvhJq=a zjviLBGdMn`ulZK_$&$4jl^|KQyz1-n&6t?R2(e15#ia!%(9mA9#@ z9NBenk3O7-bO%R`>jk>zxhwAR+za&nKp}>UT;&E(dXuXe8la!|fpQuHv=Zk{?h;kE zIOhhQV=y=I979JiX&C%Gz;%#8UPc#&0?6UeErKLKl$1ykb_~PxJ14oyk=)9@=6W*Z zA2GPkkH`~T!ThPR`9r@6=I(;nn{lxE0Qcy(WBahO_rl-e-;;vA5m zDDNP13Ud4eb7w<_rHvp%g)<&OzT_^vmBw@5A#UuC{|faK@wWZ(U!ayIat9a>R0`K7 z`1h@RqjG(j+VyE;@^^If8^7WFGnkY8#sS_9%nhNs?O1n&`A&s*9p+oY6mF92UKH>? zJ0^x3xWa#!H|cweRv%C@aGO|tNFK{O;8~} zF8Q=Bd&qtKFqSwYkXVMrO;M47;5)@t8tEzVq(8Ggg&AXZu%}QJN*>P!T!>00l0Dg&@(bZS0oWV1D9kx;vC)R(kPaz<}g^6|q-rXM=ew#gw_d;(DaV zl*}aGmnhB^v7zJG&zRdx&%eNe#Cd=R=}!)@B++t9m$)2Y^{k#Ai(-snop3RH7Q7N+wiDNsmXF3spbcqp$%jdbrSj5l>`}a_y&Jr1 z1b?M3ywR6DfJ9vhqzYa@;x_^1+}&+Hh!uen@64UK_sl)#-kCrC{^>b@_fbzEqM`K2 zX|~OdX*uOqx8s(T?OC3s+;YRQ8(rmbcGuadIWAWnI{{rode8jIEVoU2x4gNtry8Dy zh}G1fRW;3WrtFCLgp0XRNTy0h~TpqA-N7<@t zda7AB+dW06R|hz)IPG4?=B93&9i<_$=j?3wvyAT@B)RQ%Eqj+6>nLbH}EeqfCO;TRp4YRNW+QvJ0rt%hu0Z z&7~BUu_7HZE3;Jtw{eGunEU(6W-%ry?J;I2@G412q2{MTVm{WVg0RL*I7t69kTxh| zK~kt0Si&@Mx1CA8!sp(@`UlDqPFVCvn^lvD9&Ohnoz4XQ9-Z0aBupi!j7t<_h zl&?pGe{51(30fDpmgIPjKPmc<%gu=NZs;(?G29sOC%j`^I#2&HM~!2w_zamJIEi44 zUx5ZLVw_(ia6pzeI3L9;^pfEF93`Dm2`)}NMXosi6ca}<8R*=e;CGVQy@nC?r9e&v zVId>|LN+p!v?KH-A0a8{%c*Q=eovx6GAcG3}5*f%$|arJE7d!kU?ofNW+KZ0OSvkv*za24-R>~U0ZjU5xAeF@jO7UkQJ!@Hd6c#l|FBofI#F_M60{Do`+ zQT``2zw}h1TCZ6#|ICWCI>4}3_!wDqkLu;{QDEb3^j=JkTI&U=qn(+ z*-bClk2-m48Yy#l!S9hB(d16@VF~lx6dwl8{*2}OnU9{~mgL#T$C*$1xGULm$gK0z f$L3i*Jsaj2!DobvV9S3#MmgK2eUFFm>G=E~KqrVp From a1170de2cccc03b6ffa973347f265338de487e6e Mon Sep 17 00:00:00 2001 From: yasintorun Date: Wed, 26 May 2021 22:39:00 +0300 Subject: [PATCH 2/2] Set Verify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Controller kısmına Aktivasyon işlemi eklendi --- .../kodlamaio/hrms/api/controllers/UserController.java | 5 +++++ .../hrms/business/concretes/UserRegisterManager.java | 9 ++++++++- .../classes/META-INF/maven/kodlamaio/hrms/pom.properties | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java b/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java index fd55fc1..863b3b4 100644 --- a/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java +++ b/api/src/main/java/kodlamaio/hrms/api/controllers/UserController.java @@ -29,4 +29,9 @@ public UserController(UserService userService) { public DataResult> getAll() { return this.userService.getAll(); } + + @PostMapping("/verify") + public Result Verify(int userId, String verifyCode) { + return this.userService.Verify(userId, verifyCode); + } } diff --git a/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java b/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java index cab0ee2..8fbef99 100644 --- a/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java +++ b/api/src/main/java/kodlamaio/hrms/business/concretes/UserRegisterManager.java @@ -57,9 +57,16 @@ public Result NewRegister(User user) { public Result Verify(int userId, String code) { List registers = userRegisterDao.findAll(); - + if(code.isEmpty()) { + return new ErrorResult("Tüm alanları giriniz!"); + } for(UserRegister register : registers) { if(register.getUserId() == userId) { + + if(register.isComfirmed()) { + return new ErrorResult("Zaten kaydınız tamamlanmış!"); + } + if(register.getActivisionCode().equals(code)) { register.setComfirmed(true); register.setComfirmedDate(new Date()); diff --git a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties index 5edbb68..2ea25fb 100644 --- a/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties +++ b/api/target/classes/META-INF/maven/kodlamaio/hrms/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Wed May 26 21:09:48 TRT 2021 +#Wed May 26 22:31:56 TRT 2021 m2e.projectLocation=D\:\\JavaKamp\\hrms m2e.projectName=hrms groupId=kodlamaio