feat: add support for moving folders (#201)

Author: KirylKurnosenka

src/main/java/com/epam/aidial/cfg/client/ResourceClient.java

@@ -9,5 +9,5 @@
 public interface ResourceClient {
 
     @PostMapping("/v1/ops/resource/move")
-    void move(@RequestBody MoveResourceDto movePromptDto);
+    void move(@RequestBody MoveResourceDto moveResourceDto);
 }

src/main/java/com/epam/aidial/cfg/client/mapper/CoreMetadataUtils.java

@@ -36,6 +36,10 @@ public static String encodeFolderPath(String path) {
         return encodePath(path) + "/";
     }
 
+    public static String replacePathSegment(String path, String oldPathSegment, String newPathSegment) {
+        return path.replaceFirst(encodePath(oldPathSegment), encodePath(newPathSegment));
+    }
+
     private static String removeName(String path) {
         if (path == null) {
             return null;

src/main/java/com/epam/aidial/cfg/client/mapper/ResourceClientMapper.java

@@ -10,8 +10,15 @@
 public interface ResourceClientMapper {
 
     default MoveResourceDto toMoveResourceDto(MoveResource moveResource, String prefix) {
-        var sourceUrl = encodePath(prefix + moveResource.getSourceUrl());
-        var destinationUrl = encodePath(prefix + moveResource.getDestinationUrl());
+        String originalSourceUrl = moveResource.getSourceUrl();
+        String originalDestinationUrl = moveResource.getDestinationUrl();
+
+        var sourceUrl = originalSourceUrl.startsWith(prefix)
+                ? originalSourceUrl
+                : encodePath(prefix + originalSourceUrl);
+        var destinationUrl = originalDestinationUrl.startsWith(prefix)
+                ? originalDestinationUrl
+                : encodePath(prefix + originalDestinationUrl);
 
         return MoveResourceDto.builder()
                 .sourceUrl(sourceUrl)

src/main/java/com/epam/aidial/cfg/configuration/CoreResourcesConfig.java

@@ -0,0 +1,21 @@
+package com.epam.aidial.cfg.configuration;
+
+import com.epam.aidial.cfg.model.ResourceType;
+import com.epam.aidial.cfg.service.ResourceService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Configuration(proxyBeanMethods = false)
+public class CoreResourcesConfig {
+
+    @Bean
+    public Map<ResourceType, ResourceService> resourceServicesByResourceType(List<ResourceService> resourceServices) {
+        return resourceServices.stream()
+                .collect(Collectors.toMap(ResourceService::getResourceType, Function.identity()));
+    }
+}

src/main/java/com/epam/aidial/cfg/dto/MoveFolderRequestDto.java

@@ -0,0 +1,17 @@
+package com.epam.aidial.cfg.dto;
+
+import com.epam.aidial.cfg.dto.validation.annotation.MetadataPath;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MoveFolderRequestDto {
+
+    @MetadataPath
+    private String oldPath;
+    @MetadataPath
+    private String newPath;
+    private List<@NotNull ResourceTypeDto> resourceTypes;
+}

src/main/java/com/epam/aidial/cfg/exception/FolderAlreadyExistsException.java

@@ -0,0 +1,7 @@
+package com.epam.aidial.cfg.exception;
+
+public class FolderAlreadyExistsException extends ValidationException {
+    public FolderAlreadyExistsException(String message) {
+        super(message);
+    }
+}

src/main/java/com/epam/aidial/cfg/exception/FolderNotFoundException.java

@@ -0,0 +1,7 @@
+package com.epam.aidial.cfg.exception;
+
+public class FolderNotFoundException extends ValidationException {
+    public FolderNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/com/epam/aidial/cfg/mapper/ResourceMapper.java

@@ -4,6 +4,7 @@
 import com.epam.aidial.cfg.dto.ImportResourcesDto;
 import com.epam.aidial.cfg.dto.ImportResourcesFileResultDto;
 import com.epam.aidial.cfg.dto.ImportResourcesPreviewDto;
+import com.epam.aidial.cfg.dto.MoveFolderRequestDto;
 import com.epam.aidial.cfg.dto.MoveResourceDto;
 import com.epam.aidial.cfg.dto.ResourceMetadataRequestDto;
 import com.epam.aidial.cfg.dto.RuleDto;
@@ -12,6 +13,7 @@
 import com.epam.aidial.cfg.model.ImportResources;
 import com.epam.aidial.cfg.model.ImportResourcesFileResult;
 import com.epam.aidial.cfg.model.ImportResourcesPreview;
+import com.epam.aidial.cfg.model.MoveFolderRequest;
 import com.epam.aidial.cfg.model.MoveResource;
 import com.epam.aidial.cfg.model.ResourceMetadataRequest;
 import com.epam.aidial.cfg.model.Rule;
@@ -57,4 +59,6 @@ default ResourceMetadataRequest toRequest(ResourceMetadataRequestDto dto) {
     ImportResourcesFileResultDto toImportResourcesFileResultDto(ImportResourcesFileResult model);
 
     ImportResourcesPreviewDto toImportResourcesPreviewDto(ImportResourcesPreview importResourcesPreview);
+
+    MoveFolderRequest toMoveFolderRequest(MoveFolderRequestDto moveFolderRequestDto);
 }

src/main/java/com/epam/aidial/cfg/model/MoveFolderRequest.java

@@ -0,0 +1,18 @@
+package com.epam.aidial.cfg.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MoveFolderRequest {
+    private String oldPath;
+    private String newPath;
+    private List<ResourceType> resourceTypes;
+}

src/main/java/com/epam/aidial/cfg/service/ApplicationService.java

@@ -1,12 +1,16 @@
 package com.epam.aidial.cfg.service;
 
 import com.epam.aidial.cfg.client.ApplicationClient;
+import com.epam.aidial.cfg.client.ResourceClient;
 import com.epam.aidial.cfg.client.dto.ApplicationMetadataDto;
 import com.epam.aidial.cfg.client.mapper.ApplicationClientMapper;
+import com.epam.aidial.cfg.client.mapper.ResourceClientMapper;
 import com.epam.aidial.cfg.configuration.logging.LogExecution;
 import com.epam.aidial.cfg.model.ApplicationResource;
 import com.epam.aidial.cfg.model.FolderInfo;
+import com.epam.aidial.cfg.model.MoveResource;
 import com.epam.aidial.cfg.model.ResourceMetadataRequest;
+import com.epam.aidial.cfg.model.ResourceType;
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -19,25 +23,40 @@
 public class ApplicationService implements ResourceService {
 
     private final ApplicationClient applicationClient;
-    private final ApplicationClientMapper mapper;
+    private final ApplicationClientMapper applicationClientMapper;
+    private final ResourceClient resourceClient;
+    private final ResourceClientMapper resourceClientMapper;
 
+    @Override
     public FolderInfo getFolders(ResourceMetadataRequest request) {
         try {
             ApplicationMetadataDto applicationMetadata = getMetadata(request);
-            return mapper.toFolderInfo(applicationMetadata, APPLICATIONS_PREFIX);
+            return applicationClientMapper.toFolderInfo(applicationMetadata, APPLICATIONS_PREFIX);
         } catch (FeignException.FeignClientException.NotFound notFound) {
             return null;
         }
     }
 
+    @Override
     public ApplicationMetadataDto getMetadata(ResourceMetadataRequest request) {
         return applicationClient.getApplicationMetadata(request.getPath(), request.isRecursive(), request.getNextToken());
     }
 
+    @Override
+    public void move(MoveResource moveResource) {
+        var moveResourceDto = resourceClientMapper.toMoveResourceDto(moveResource, APPLICATIONS_PREFIX);
+        resourceClient.move(moveResourceDto);
+    }
+
+    @Override
+    public ResourceType getResourceType() {
+        return ResourceType.APPLICATION;
+    }
+
     public ApplicationResource getApplicationResource(String path) {
         var applicationDto = applicationClient.getApplicationResource(path);
         var applicationMetadataDto = applicationClient.getApplicationMetadata(path, false, null);
-        return mapper.toApplicationResource(applicationDto, applicationMetadataDto);
+        return applicationClientMapper.toApplicationResource(applicationDto, applicationMetadataDto);
     }
 
 }