Merge pull request #29 from Staketab/dev

add edit domain endpoint, and add exception handler

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

@@ -26,9 +26,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.NoSuchElementException;
-
-import static org.springframework.http.ResponseEntity.notFound;
 import static org.springframework.http.ResponseEntity.ok;
 
 @RestController
@@ -75,20 +72,12 @@ public ResponseEntity<DomainEntity> create(@RequestBody DomainReservationDTO dom
 
     @GetMapping("/{id}")
     public ResponseEntity<DomainEntity> retrieve(@PathVariable String id) {
-        try {
-            return ok(domainService.retrieve(id).orElseThrow(NoSuchElementException::new));
-        } catch (NoSuchElementException e) {
-            return notFound().build();
-        }
+        return ok(domainService.retrieve(id));
     }
 
     @PutMapping("/edit")
     public ResponseEntity<DomainEntity> update(@RequestBody DomainUpdateDTO domainUpdate) {
-        try {
-            return ok(domainService.update(domainUpdate));
-        } catch (NoSuchElementException e) {
-            return notFound().build();
-        }
+        return ok(domainService.update(domainUpdate));
     }
 
     @GetMapping("/{domainName}/reserved")

src/main/java/com/staketab/minanames/dto/DomainUpdateDTO.java

@@ -1,9 +1,16 @@
 package com.staketab.minanames.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class DomainUpdateDTO {
+
+    private String id;
+    private String img;
 }

src/main/java/com/staketab/minanames/exception/ApiError.java

@@ -0,0 +1,9 @@
+package com.staketab.minanames.exception;
+
+import org.springframework.http.HttpStatusCode;
+
+public record ApiError(String statusCode, String message) {
+    public ApiError(HttpStatusCode statusCode, String message) {
+        this(statusCode.toString(), message);
+    }
+}

src/main/java/com/staketab/minanames/exception/NotFoundException.java

@@ -0,0 +1,7 @@
+package com.staketab.minanames.exception;
+
+public class NotFoundException extends RuntimeException {
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/com/staketab/minanames/exception/RestExceptionHandler.java

@@ -0,0 +1,20 @@
+package com.staketab.minanames.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@Slf4j
+@RestControllerAdvice
+public class RestExceptionHandler {
+
+    @ResponseStatus(NOT_FOUND)
+    @ExceptionHandler(NotFoundException.class)
+    public ResponseEntity<ApiError> handleException(Exception e) {
+        return ResponseEntity.status(NOT_FOUND).body(new ApiError(NOT_FOUND, e.getMessage()));
+    }
+}

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

@@ -8,13 +8,11 @@
 import com.staketab.minanames.entity.DomainEntity;
 import org.springframework.data.domain.Page;
 
-import java.util.Optional;
-
 public interface DomainService {
     Page<DomainEntity> findAllByPageable(BaseRequest request, SearchParams searchParams);
     Page<DomainEntity> findAllByAccountPageable(BaseRequest request, String accountAddress, SearchParams searchParams);
     DomainEntity create(DomainReservationDTO domainRequest);
-    Optional<DomainEntity> retrieve(String id);
+    DomainEntity retrieve(String id);
     DomainEntity update(DomainUpdateDTO domainUpdateDTO);
     ReservedDomainDTO isNameReserved(String name);
     Boolean setDefaultDomain(String id);

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

@@ -7,6 +7,7 @@
 import com.staketab.minanames.dto.request.SearchParams;
 import com.staketab.minanames.entity.DomainEntity;
 import com.staketab.minanames.entity.dto.DomainStatus;
+import com.staketab.minanames.exception.NotFoundException;
 import com.staketab.minanames.repository.DomainRepository;
 import com.staketab.minanames.service.abstraction.DomainService;
 import com.staketab.minanames.service.abstraction.TxService;
@@ -55,13 +56,20 @@ public DomainEntity create(DomainReservationDTO request) {
     }
 
     @Override
-    public Optional<DomainEntity> retrieve(String id) {
-        return domainRepository.findById(id);
+    public DomainEntity retrieve(String id) {
+        return domainRepository.findById(id)
+                .orElseThrow(() -> new NotFoundException(String.format("Domain doesn't found by id: %s", id)));
     }
 
     @Override
     public DomainEntity update(DomainUpdateDTO domainUpdateDTO) {
-        return null;
+        Optional<DomainEntity> optionalDomainEntity = domainRepository.findById(domainUpdateDTO.getId());
+        if (optionalDomainEntity.isEmpty()) {
+            throw new NotFoundException(String.format("Domain doesn't found by id: %s", domainUpdateDTO.getId()));
+        }
+        DomainEntity domainEntity = optionalDomainEntity.get();
+        domainEntity.setDomainImg(domainUpdateDTO.getImg());
+        return domainRepository.save(domainEntity);
     }
 
     @Override