fix: [PL-27376]: Resource Group Async Reconciliation Handler (#36498)

* fix: [PL-27376]: Resource Group Async Reconciliation Handler

* fix: Bind ResourceGroup Validator

Author: reetika04

platform-service/modules/resource-group-service/src/main/java/io/harness/resourcegroup/framework/v2/service/ResourceGroupValidator.java

@@ -10,9 +10,11 @@
 import static io.harness.annotations.dev.HarnessTeam.PL;
 
 import io.harness.annotations.dev.OwnedBy;
+import io.harness.resourcegroup.v2.model.ResourceGroup;
 import io.harness.resourcegroup.v2.remote.dto.ResourceGroupRequest;
 
 @OwnedBy(PL)
 public interface ResourceGroupValidator {
+  boolean sanitizeResourceSelectors(ResourceGroup resourceGroup);
   void validateResourceGroup(ResourceGroupRequest resourceGroupRequest);
 }

platform-service/modules/resource-group-service/src/main/java/io/harness/resourcegroup/framework/v2/service/impl/ResourceGroupValidatorImpl.java

@@ -92,6 +92,7 @@ private boolean isValidDynamicResourceSelector(
                 : resourceMap.get(resourceType).getSelectorKind().get(scopeLevel).contains(BY_RESOURCE_TYPE));
   }
 
+  @Override
   public boolean sanitizeResourceSelectors(ResourceGroup resourceGroup) {
     if (resourceGroup.getResourceFilter() == null) {
       return false;
@@ -166,6 +167,7 @@ private void validateResourceFilter(ResourceFilter resourceFilter, boolean inclu
     }
   }
 
+  @Override
   public void validateResourceGroup(ResourceGroupRequest resourceGroupRequest) {
     if (resourceGroupRequest == null || resourceGroupRequest.getResourceGroup() == null) {
       return;

platform-service/modules/resource-group-service/src/main/java/io/harness/resourcegroup/reconciliation/ResourceGroupAsyncReconciliationHandler.java

@@ -18,11 +18,11 @@
 import io.harness.mongo.iterator.MongoPersistenceIterator;
 import io.harness.mongo.iterator.filter.SpringFilterExpander;
 import io.harness.mongo.iterator.provider.SpringPersistenceProvider;
-import io.harness.resourcegroup.framework.v1.service.impl.ResourceGroupValidatorServiceImpl;
 import io.harness.resourcegroup.framework.v2.remote.mapper.ResourceGroupMapper;
 import io.harness.resourcegroup.framework.v2.service.ResourceGroupService;
-import io.harness.resourcegroup.v1.model.ResourceGroup;
-import io.harness.resourcegroup.v1.model.ResourceGroup.ResourceGroupKeys;
+import io.harness.resourcegroup.framework.v2.service.ResourceGroupValidator;
+import io.harness.resourcegroup.v2.model.ResourceGroup;
+import io.harness.resourcegroup.v2.model.ResourceGroup.ResourceGroupKeys;
 
 import com.google.inject.Inject;
 import lombok.AllArgsConstructor;
@@ -39,14 +39,14 @@ public class ResourceGroupAsyncReconciliationHandler implements MongoPersistence
   @Inject private final PersistenceIteratorFactory persistenceIteratorFactory;
   @Inject private final MongoTemplate mongoTemplate;
   @Inject private final ResourceGroupService resourceGroupService;
-  @Inject private final ResourceGroupValidatorServiceImpl resourceGroupValidatorService;
+  @Inject private final ResourceGroupValidator resourceGroupValidator;
 
   @Override
   public void handle(ResourceGroup resourceGroup) {
-    boolean updated = resourceGroupValidatorService.sanitizeResourceSelectors(resourceGroup);
+    boolean updated = resourceGroupValidator.sanitizeResourceSelectors(resourceGroup);
     if (updated) {
-      resourceGroupService.update(ResourceGroupMapper.toDTO(ResourceGroupMapper.fromV1(resourceGroup)),
-          Boolean.TRUE.equals(resourceGroup.getHarnessManaged()));
+      resourceGroupService.update(
+          ResourceGroupMapper.toDTO(resourceGroup), Boolean.TRUE.equals(resourceGroup.getHarnessManaged()));
     }
   }
 

platform-service/service/src/main/java/io/harness/platform/resourcegroup/ResourceGroupServiceModule.java

@@ -44,6 +44,8 @@
 import io.harness.platform.PlatformConfiguration;
 import io.harness.redis.RedisConfig;
 import io.harness.resourcegroup.ResourceGroupModule;
+import io.harness.resourcegroup.framework.v2.service.ResourceGroupValidator;
+import io.harness.resourcegroup.framework.v2.service.impl.ResourceGroupValidatorImpl;
 import io.harness.serializer.KryoRegistrar;
 import io.harness.serializer.PrimaryVersionManagerRegistrars;
 import io.harness.serializer.morphia.ResourceGroupSerializer;
@@ -121,6 +123,7 @@ public UserProvider userProvider() {
     install(ExecutorModule.getInstance());
     bind(PlatformConfiguration.class).toInstance(appConfig);
     bind(HPersistence.class).to(MongoPersistence.class);
+    bind(ResourceGroupValidator.class).to(ResourceGroupValidatorImpl.class);
     install(VersionModule.getInstance());
     install(PrimaryVersionManagerModule.getInstance());
     install(new ValidationModule(getValidatorFactory()));