Feature/js develop/private education query controller main

auth-service/auth-data-access/src/main/java/az/rock/flyjob/auth/dataAccess/model/compose/BaseCompose.java

@@ -9,6 +9,7 @@
 
 @Compose
 public class BaseCompose {
+
     private UUID uuid;
 
     private Long version;

auth-service/auth-domain/auth-domain-presentation/src/main/java/az/rock/auth/domain/presentation/ports/input/service/query/concretes/user/UserQueryPrivateDomainPresentation.java

@@ -1,20 +1,16 @@
 package az.rock.auth.domain.presentation.ports.input.service.query.concretes.user;
 
 import az.rock.auth.domain.presentation.dto.response.user.*;
+import az.rock.auth.domain.presentation.ports.input.service.query.abstracts.user.AbstractUserQueryDomainPresentation;
 import az.rock.auth.domain.presentation.ports.output.publisher.AbstractNotificationMessagePublisher;
 import az.rock.auth.domain.presentation.ports.output.repository.query.user.AbstractUserProfileQueryRepositoryAdapter;
-import az.rock.auth.domain.presentation.security.AbstractSecurityContextHolder;
-import az.rock.auth.domain.presentation.exception.AuthDomainPresentationException;
-import az.rock.auth.domain.presentation.ports.input.service.query.abstracts.user.AbstractUserQueryDomainPresentation;
 import az.rock.auth.domain.presentation.ports.output.repository.query.user.AbstractUserQueryRepositoryAdapter;
+import az.rock.auth.domain.presentation.security.AbstractSecurityContextHolder;
 import az.rock.flyjob.auth.exception.user.MyFollowersNotFoundException;
 import az.rock.flyjob.auth.exception.user.MyNetworksNotFoundException;
 import az.rock.flyjob.auth.exception.user.MyUserProfileNotFoundException;
 import az.rock.flyjob.auth.exception.user.UserProfileNotFoundException;
 import az.rock.flyjob.auth.model.query.AnyProfileQueryRecord;
-import az.rock.flyjob.auth.model.root.network.FollowRelationRoot;
-import az.rock.flyjob.auth.model.root.user.UserRoot;
-import az.rock.lib.domain.id.auth.UserID;
 import az.rock.lib.valueObject.common.PageableRequest;
 import com.intellibucket.lib.fj.notificatin.api.notifications.ViewedProfileNotification;
 import org.springframework.stereotype.Service;
@@ -55,11 +51,10 @@ public MyUserProfileResponse myProfile() {
     public AnyUserProfileResponse anyProfile(UUID userID) {
         var currentUser = this.securityContextHolder.availableUser();
         Optional<AnyProfileQueryRecord> optionalUserProfile = this.userProfileQueryRepositoryAdapter.findAnyProfile(currentUser.getAbsoluteID(), userID);
-        if (optionalUserProfile.isPresent()){
+        if (optionalUserProfile.isPresent()) {
             this.notificationMessagePublisher.send(ViewedProfileNotification.of(currentUser.getAbsoluteID(), userID));
             return AnyUserProfileResponse.of(optionalUserProfile.get());
-        }
-        else throw new UserProfileNotFoundException();
+        } else throw new UserProfileNotFoundException();
     }
 
     @Override

job-seeker-service/js-application/js-presentation/src/main/java/az/rock/flyjob/js/presentation/api/rest/privates/query/resume/detail/EducationQueryPrivateController.java

@@ -4,49 +4,66 @@
 import az.rock.flyjob.js.domain.presentation.dto.response.resume.education.MyEducationResponseModel;
 import az.rock.flyjob.js.domain.presentation.dto.response.resume.education.simple.SimpleAnyEducationResponseModel;
 import az.rock.flyjob.js.domain.presentation.dto.response.resume.education.simple.SimpleMyEducationResponseModel;
+import az.rock.flyjob.js.domain.presentation.ports.input.services.query.abstracts.AbstractEducationQueryDomainPresentationService;
 import az.rock.flyjob.js.spec.privates.query.resume.detail.EducationQueryPrivateSpec;
 import az.rock.lib.jresponse.response.success.JSuccessDataResponse;
 import az.rock.lib.valueObject.SimplePageableRequest;
 import az.rock.lib.valueObject.SimplePageableResponse;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.UUID;
 
 @RestController
+@CrossOrigin
+@RequestMapping(value = "/js/1.0/private/query/education", produces = MediaType.APPLICATION_JSON_VALUE)
 public class EducationQueryPrivateController implements EducationQueryPrivateSpec {
+    private final AbstractEducationQueryDomainPresentationService educationQueryDomainPresentationService;
 
+    public EducationQueryPrivateController(AbstractEducationQueryDomainPresentationService educationQueryDomainPresentationService) {
+        this.educationQueryDomainPresentationService = educationQueryDomainPresentationService;
+    }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<MyEducationResponseModel>>> queryAllMyEducations(SimplePageableRequest pageableRequest) {
-
-        return null;
+    @GetMapping("/get-my/educations")
+    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<MyEducationResponseModel>>> queryAllMyEducations(@ModelAttribute("pageableRequest") SimplePageableRequest pageableRequest) {
+        var response = educationQueryDomainPresentationService.queryAllMyEducations(pageableRequest);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<AnyEducationResponseModel>>> queryAllAnyEducations(UUID targetResumeId, SimplePageableRequest pageableRequest) {
-
-        return null;
+    @GetMapping("/get-any/educations/{targetResumeId}")
+    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<AnyEducationResponseModel>>> queryAllAnyEducations(@PathVariable UUID targetResumeId, @ModelAttribute("pageableRequest") SimplePageableRequest pageableRequest) {
+        var response = educationQueryDomainPresentationService.queryAllAnyEducations(targetResumeId, pageableRequest);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<SimpleMyEducationResponseModel>>> queryAllMySimpleEducations(SimplePageableRequest pageableRequest) {
-
-        return null;
+    @GetMapping("/get-my/simple-educations")
+    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<SimpleMyEducationResponseModel>>> queryAllMySimpleEducations(@ModelAttribute("pageableRequest") SimplePageableRequest pageableRequest) {
+        var response = educationQueryDomainPresentationService.queryAllMySimpleEducations(pageableRequest);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<SimpleAnyEducationResponseModel>>> queryAllAnySimpleEducations(UUID targetResumeId, SimplePageableRequest pageableRequest) {
-        return null;
+    @GetMapping("/get-any/simple-educations/{targetResumeId}")
+    public ResponseEntity<JSuccessDataResponse<SimplePageableResponse<SimpleAnyEducationResponseModel>>> queryAllAnySimpleEducations(@PathVariable UUID targetResumeId, @ModelAttribute("pageableRequest") SimplePageableRequest pageableRequest) {
+        var response = educationQueryDomainPresentationService.queryAllAnySimpleEducations(targetResumeId, pageableRequest);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<MyEducationResponseModel>> findMyEducationById(UUID id) {
-        return null;
+    @GetMapping("/get-my/education/{id}")
+    public ResponseEntity<JSuccessDataResponse<MyEducationResponseModel>> findMyEducationById(@PathVariable UUID id) {
+        var response = educationQueryDomainPresentationService.findMyEducationById(id);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 
     @Override
-    public ResponseEntity<JSuccessDataResponse<AnyEducationResponseModel>> findAnyEducationById(UUID id) {
-        return null;
+    @GetMapping("/get-any/education/{id}")
+    public ResponseEntity<JSuccessDataResponse<AnyEducationResponseModel>> findAnyEducationById(@PathVariable UUID id) {
+        var response = educationQueryDomainPresentationService.findAnyEducationById(id);
+        return ResponseEntity.ok(new JSuccessDataResponse<>(response));
     }
 }

job-seeker-service/js-data-access/src/main/java/az/rock/flyjob/js/dataaccess/adapter/query/EducationQueryRepositoryAdapter.java

@@ -1,11 +1,17 @@
 package az.rock.flyjob.js.dataaccess.adapter.query;
 
 import az.rock.flyjob.js.dataaccess.mapper.abstracts.AbstractEducationDataAccessMapper;
+import az.rock.flyjob.js.dataaccess.mapper.concretes.PageableDataAccessMapper;
+import az.rock.flyjob.js.dataaccess.model.batis.model.EducationComposeExample;
+import az.rock.flyjob.js.dataaccess.repository.abstracts.query.batis.EducationBatisRepository;
 import az.rock.flyjob.js.dataaccess.repository.abstracts.query.jpa.EducationQueryJpaRepository;
 import az.rock.flyjob.js.domain.core.root.detail.EducationRoot;
+import az.rock.flyjob.js.domain.presentation.dto.criteria.EducationCriteria;
 import az.rock.flyjob.js.domain.presentation.ports.output.repository.query.AbstractEducationQueryRepositoryAdapter;
 import az.rock.lib.domain.id.js.EducationID;
 import az.rock.lib.domain.id.js.ResumeID;
+import az.rock.lib.valueObject.SimplePageableRequest;
+import com.intellibucket.lib.fj.dataaccess.BatisPageable;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -15,12 +21,15 @@
 @Component
 public class EducationQueryRepositoryAdapter implements AbstractEducationQueryRepositoryAdapter {
 
+    private final static String orderByOrderNumber = "order_number";
     private final EducationQueryJpaRepository educationQueryJpaRepository;
     private final AbstractEducationDataAccessMapper educationDataAccessMapper;
+    private final EducationBatisRepository educationBatisRepository;
 
-    public EducationQueryRepositoryAdapter(EducationQueryJpaRepository educationQueryJpaRepository, AbstractEducationDataAccessMapper educationDataAccessMapper) {
+    public EducationQueryRepositoryAdapter(EducationQueryJpaRepository educationQueryJpaRepository, AbstractEducationDataAccessMapper educationDataAccessMapper, EducationBatisRepository educationBatisRepository) {
         this.educationQueryJpaRepository = educationQueryJpaRepository;
         this.educationDataAccessMapper = educationDataAccessMapper;
+        this.educationBatisRepository = educationBatisRepository;
     }
 
     @Override
@@ -30,6 +39,27 @@ public Optional<EducationRoot> findByResumeAndUuidAndRowStatusTrue(ResumeID resu
         return educationDataAccessMapper.toRoot(entity.get());
     }
 
+    @Override
+    public List<EducationRoot> fetchAllEducations(EducationCriteria educationCriteria, SimplePageableRequest simplePageableRequest) {
+        var educationComposeExample = EducationComposeExample.of(educationCriteria, orderByOrderNumber, BatisPageable.of(simplePageableRequest.getSize(), simplePageableRequest.getPage()));
+        var composes = educationBatisRepository.selectByExample(educationComposeExample);
+        System.out.println(composes);
+        return composes
+                .stream()
+                .map(educationDataAccessMapper::composeToRoot)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .toList();
+    }
+
+    @Override
+    public Optional<EducationRoot> fetchEducation(EducationCriteria educationCriteria) {
+        var educationComposeExample = EducationComposeExample.of(educationCriteria);
+        var educationCompose = educationBatisRepository.selectFirstByExample(educationComposeExample);
+        return educationDataAccessMapper.composeToRoot(educationCompose);
+    }
+
+
     @Override
     public Optional<EducationRoot> findById(EducationID rootId) {
         var entity = educationQueryJpaRepository.findById(rootId.getAbsoluteID());

job-seeker-service/js-data-access/src/main/java/az/rock/flyjob/js/dataaccess/mapper/abstracts/AbstractEducationDataAccessMapper.java

@@ -1,12 +1,14 @@
 package az.rock.flyjob.js.dataaccess.mapper.abstracts;
 
+import az.rock.flyjob.js.dataaccess.model.batis.model.EducationCompose;
 import az.rock.flyjob.js.dataaccess.model.entity.resume.details.EducationEntity;
 import az.rock.flyjob.js.domain.core.root.detail.EducationRoot;
 import com.intellibucket.lib.fj.dataaccess.AbstractDataAccessMapper;
 
+import java.util.Optional;
 
 
 public interface AbstractEducationDataAccessMapper extends AbstractDataAccessMapper<EducationEntity, EducationRoot> {
-
+    Optional<EducationRoot> composeToRoot(EducationCompose educationCompose);
 
 }

job-seeker-service/js-data-access/src/main/java/az/rock/flyjob/js/dataaccess/mapper/concretes/EducationDataAccessMapper.java

@@ -2,16 +2,23 @@
 
 
 import az.rock.flyjob.js.dataaccess.mapper.abstracts.AbstractEducationDataAccessMapper;
+import az.rock.flyjob.js.dataaccess.model.batis.model.EducationCompose;
 import az.rock.flyjob.js.dataaccess.model.entity.resume.ResumeEntity;
 import az.rock.flyjob.js.dataaccess.model.entity.resume.details.EducationEntity;
 import az.rock.flyjob.js.domain.core.root.detail.EducationRoot;
 import az.rock.lib.domain.id.js.EducationID;
 import az.rock.lib.domain.id.js.ResumeID;
 import az.rock.lib.util.GDateTime;
+import az.rock.lib.valueObject.AccessModifier;
+import az.rock.lib.valueObject.ProcessStatus;
+import az.rock.lib.valueObject.RowStatus;
 import az.rock.lib.valueObject.Version;
+import az.rock.lib.valueObject.js.EducationDegree;
+import az.rock.lib.valueObject.js.EducationState;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
+import java.util.UUID;
 
 @Component
 public class EducationDataAccessMapper implements AbstractEducationDataAccessMapper {
@@ -68,5 +75,30 @@ public Optional<EducationEntity> toEntity(EducationRoot root) {
     }
 
 
+    @Override
+    public Optional<EducationRoot> composeToRoot(EducationCompose educationCompose) {
+        var optionalEducationCompose = Optional.ofNullable(educationCompose);
+        return optionalEducationCompose.map(compose -> EducationRoot.Builder.builder()
+                .uuid(EducationID.of(compose.getUuid()))
+                .resume(ResumeID.of(compose.getResumeUuid()))
+                .version(Version.of(compose.getVersion()))
+                .rowStatus(RowStatus.valueOf(compose.getRowStatus()))
+                .processStatus(ProcessStatus.of(compose.getProcessStatus()))
+                .createdDate(GDateTime.of(compose.getCreatedDate()))
+                .lastModifiedDate(GDateTime.of(compose.getModificationDate()))
+                .accessModifier(AccessModifier.valueOf(compose.getAccessModifier()))
+                .cityId((UUID) compose.getCityId())
+                .establishmentUUID((UUID) compose.getEstablishmentUuid())
+                .establishmentName(compose.getEstablishmentName())
+                .orderNumber(compose.getOrderNumber())
+                .startDate(GDateTime.convertToLocalDate(compose.getStartDate()))
+                .endDate(GDateTime.convertToLocalDate(compose.getEndDate()))
+                .description(compose.getDescription())
+                .link(compose.getLink())
+                .state(EducationState.valueOf(compose.getState()))
+                .degree(EducationDegree.valueOf(compose.getDegree()))
+                .build());
+    }
+
 
 }