Merge pull request #74 from Staketab/dev

added domain status parameter chossing

Author: sineDtS

src/main/java/com/staketab/minanames/controller/DomainController.java

@@ -12,6 +12,7 @@
 import com.staketab.minanames.dto.request.SearchParams;
 import com.staketab.minanames.dto.request.sort.DomainsSortColumn;
 import com.staketab.minanames.entity.DomainEntity;
+import com.staketab.minanames.entity.DomainStatus;
 import com.staketab.minanames.service.DomainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -61,10 +62,12 @@ public Page<DomainEntity> getAccountDomains(@Valid @ParameterObject BaseRequest
                                                 @RequestParam @Schema(defaultValue = "RESERVATION_TIMESTAMP", allowableValues =
                                                         {"AMOUNT", "STATUS", "RESERVATION_TIMESTAMP", "IS_SEND_TO_CLOUD_WORKER"},
                                                         description = "Select sorting parameter.") DomainsSortColumn sortBy,
+                                                @RequestParam(required = false)
+                                                    @Parameter(description = "Domain status") DomainStatus domainStatus,
                                                 @RequestParam(required = false, defaultValue = "")
-                                                @Parameter(description = "Domain Name") String searchStr) {
+                                                    @Parameter(description = "Domain Name") String searchStr) {
         SearchParams searchParams = new SearchParams(searchStr);
-        return domainService.findAllByAccountPageable(request.withSortColumn(sortBy), accountAddress, searchParams);
+        return domainService.findAllByAccountPageable(request.withSortColumn(sortBy), accountAddress, searchParams, domainStatus.name());
     }
 
     @GetMapping("/simple")

src/main/java/com/staketab/minanames/repository/DomainRepository.java

@@ -1,6 +1,7 @@
 package com.staketab.minanames.repository;
 
 import com.staketab.minanames.entity.DomainEntity;
+import com.staketab.minanames.entity.DomainStatus;
 import com.staketab.minanames.entity.PayableTransactionEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -36,9 +37,12 @@ public interface DomainRepository extends JpaRepository<DomainEntity, String> {
     @Query(nativeQuery = true,
             value = """
                     select *
-                        from domains
-                        where owner_address = :accountAddress and (:searchStr is null or name = :searchStr)""")
-    Page<DomainEntity> findAllDomainsByAccount(String searchStr, String accountAddress, Pageable buildPageable);
+                    from domains
+                    where owner_address = :accountAddress
+                      and (:searchStr is null or name = :searchStr)
+                      and (:domainStatus is null or status = :domainStatus)
+                    """)
+    Page<DomainEntity> findAllDomainsByAccount(String searchStr, String accountAddress, String domainStatus, Pageable buildPageable);
 
     @Query(nativeQuery = true,
             value = """

src/main/java/com/staketab/minanames/service/DomainService.java

@@ -11,14 +11,16 @@
 import com.staketab.minanames.dto.request.BaseRequest;
 import com.staketab.minanames.dto.request.SearchParams;
 import com.staketab.minanames.entity.DomainEntity;
+import com.staketab.minanames.entity.DomainStatus;
 import org.springframework.data.domain.Page;
 
 public interface DomainService {
     Page<DomainEntity> findAllByPageable(BaseRequest request, SearchParams searchParams);
 
     Page<SimpleDomainDTO> findAllSimpleDomainsByPageable(BaseRequest request);
 
-    Page<DomainEntity> findAllByAccountPageable(BaseRequest request, String accountAddress, SearchParams searchParams);
+    Page<DomainEntity> findAllByAccountPageable(BaseRequest request, String accountAddress, SearchParams searchParams,
+                                                String domainStatus);
 
     DomainEntity create(DomainReservationDTO domainRequest);
 

src/main/java/com/staketab/minanames/service/impl/DomainServiceImpl.java

@@ -78,8 +78,9 @@ public Page<SimpleDomainDTO> findAllSimpleDomainsByPageable(BaseRequest request)
     }
 
     @Override
-    public Page<DomainEntity> findAllByAccountPageable(BaseRequest request, String accountAddress, SearchParams searchParams) {
-        return domainRepository.findAllDomainsByAccount(searchParams.getSearchStr(), accountAddress, request.buildPageable());
+    public Page<DomainEntity> findAllByAccountPageable(BaseRequest request, String accountAddress, SearchParams searchParams,
+                                                       String domainStatus) {
+        return domainRepository.findAllDomainsByAccount(searchParams.getSearchStr(), accountAddress, domainStatus, request.buildPageable());
     }
 
     @Override