Check mres name availability based on managedservice name

apps/console/internal/app/graph/schema.graphqls

@@ -94,7 +94,7 @@ input CoreSearchVPNDevices {
 }
 
 type Query {
-	core_checkNameAvailability(envName: String, resType: ConsoleResType!, name: String!): ConsoleCheckNameAvailabilityOutput! @isLoggedIn @hasAccount
+	core_checkNameAvailability(envName: String, msvcName: String ,resType: ConsoleResType!, name: String!): ConsoleCheckNameAvailabilityOutput! @isLoggedIn @hasAccount
 
 	core_listEnvironments(search: SearchEnvironments, pq: CursorPaginationIn): EnvironmentPaginatedRecords @isLoggedInAndVerified @hasAccount
 	core_getEnvironment(name: String!): Environment @isLoggedInAndVerified @hasAccount
@@ -109,6 +109,7 @@ type Query {
 	core_getApp(envName: String!, name: String!): App @isLoggedInAndVerified @hasAccount
 	core_resyncApp(envName: String!, name: String!): Boolean! @isLoggedInAndVerified @hasAccount
 	core_restartApp(envName: String!, appName: String!): Boolean! @isLoggedInAndVerified @hasAccount
+	core_removeDeviceIntercepts(envName: String!, deviceName: String!): Boolean! @isLoggedInAndVerified @hasAccount
 
 	core_listExternalApps(envName: String!, search: SearchExternalApps, pq: CursorPaginationIn): ExternalAppPaginatedRecords @isLoggedInAndVerified @hasAccount
 	core_getExternalApp(envName: String!, name: String!): ExternalApp @isLoggedInAndVerified @hasAccount

apps/console/internal/domain/api.go

@@ -134,7 +134,7 @@ type UpdateAndDeleteOpts struct {
 }
 
 type Domain interface {
-	CheckNameAvailability(ctx context.Context, accountName string, environmentName *string, resType entities.ResourceType, name string) (*CheckNameAvailabilityOutput, error)
+	CheckNameAvailability(ctx context.Context, accountName string, environmentName *string, msvcName *string, resType entities.ResourceType, name string) (*CheckNameAvailabilityOutput, error)
 
 	// INFO: project have been disabled
 	// ListProjects(ctx context.Context, userId repos.ID, accountName string, search map[string]repos.MatchFilter, pagination repos.CursorPagination) (*repos.PaginatedRecord[*entities.Project], error)
@@ -174,6 +174,7 @@ type Domain interface {
 
 	InterceptApp(ctx ResourceContext, appName string, deviceName string, intercept bool, portMappings []crdsv1.AppInterceptPortMappings) (bool, error)
 	RestartApp(ctx ResourceContext, appName string) error
+	RemoveDeviceIntercepts(ctx ResourceContext, deviceName string) error
 
 	OnAppApplyError(ctx ResourceContext, errMsg string, name string, opts UpdateAndDeleteOpts) error
 	OnAppDeleteMessage(ctx ResourceContext, app entities.App) error

apps/console/internal/domain/app.go

@@ -250,6 +250,33 @@ func (d *domain) RestartApp(ctx ResourceContext, appName string) error {
 	return nil
 }
 
+func (d *domain) RemoveDeviceIntercepts(ctx ResourceContext, deviceName string) error {
+	apps, err := d.appRepo.Find(ctx, repos.Query{
+		Filter: repos.Filter{
+			fields.AccountName:          ctx.AccountName,
+			fields.EnvironmentName:      ctx.EnvironmentName,
+			fc.AppSpecInterceptToDevice: deviceName,
+		},
+		Sort: nil,
+	})
+	if err != nil {
+		return errors.NewE(err)
+	}
+
+	for i := range apps {
+		patchForUpdate := repos.Document{
+			fc.AppSpecIntercept: nil,
+		}
+
+		_, err := d.appRepo.PatchById(ctx, apps[i].Id, patchForUpdate)
+		if err != nil {
+			return errors.NewE(err)
+		}
+	}
+
+	return nil
+}
+
 func (d *domain) OnAppUpdateMessage(ctx ResourceContext, app entities.App, status types.ResourceStatus, opts UpdateAndDeleteOpts) error {
 	xApp, err := d.findApp(ctx, app.Name)
 	if err != nil {

apps/console/internal/domain/domain.go

@@ -49,14 +49,14 @@ type domain struct {
 	environmentRepo repos.DbRepo[*entities.Environment]
 	vpnDeviceRepo   repos.DbRepo[*entities.ConsoleVPNDevice]
 
-	appRepo         repos.DbRepo[*entities.App]
-	externalAppRepo repos.DbRepo[*entities.ExternalApp]
-	configRepo      repos.DbRepo[*entities.Config]
-	secretRepo      repos.DbRepo[*entities.Secret]
-	routerRepo      repos.DbRepo[*entities.Router]
-	mresRepo        repos.DbRepo[*entities.ManagedResource]
+	appRepo          repos.DbRepo[*entities.App]
+	externalAppRepo  repos.DbRepo[*entities.ExternalApp]
+	configRepo       repos.DbRepo[*entities.Config]
+	secretRepo       repos.DbRepo[*entities.Secret]
+	routerRepo       repos.DbRepo[*entities.Router]
+	mresRepo         repos.DbRepo[*entities.ManagedResource]
 	importedMresRepo repos.DbRepo[*entities.ImportedManagedResource]
-	pullSecretsRepo repos.DbRepo[*entities.ImagePullSecret]
+	pullSecretsRepo  repos.DbRepo[*entities.ImagePullSecret]
 
 	envVars *env.Env
 

apps/console/internal/domain/names.go

@@ -2,6 +2,7 @@ package domain
 
 import (
 	"context"
+	fc "github.com/kloudlite/api/apps/console/internal/entities/field-constants"
 
 	"github.com/kloudlite/api/common/fields"
 
@@ -27,11 +28,15 @@ func checkResourceName[T repos.Entity](ctx context.Context, filters repos.Filter
 	}, nil
 }
 
-func (d *domain) CheckNameAvailability(ctx context.Context, accountName string, environmentName *string, resType entities.ResourceType, name string) (*CheckNameAvailabilityOutput, error) {
+func (d *domain) CheckNameAvailability(ctx context.Context, accountName string, environmentName *string, msvcName *string, resType entities.ResourceType, name string) (*CheckNameAvailabilityOutput, error) {
 	errEnvironmentRequired := func() error {
 		return errors.Newf("param environmentName is required for resource type %q", resType)
 	}
 
+	errMsvcNameRequired := func() error {
+		return errors.Newf("param msvcName is required for resource type %q", resType)
+	}
+
 	if !fn.IsValidK8sResourceName(name) {
 		return &CheckNameAvailabilityOutput{
 			Result:         false,
@@ -51,7 +56,10 @@ func (d *domain) CheckNameAvailability(ctx context.Context, accountName string,
 
 	case entities.ResourceTypeManagedResource:
 		{
-			return checkResourceName(ctx, repos.Filter{fields.AccountName: accountName, fields.MetadataName: name}, d.mresRepo)
+			if msvcName == nil {
+				return nil, errMsvcNameRequired()
+			}
+			return checkResourceName(ctx, repos.Filter{fields.AccountName: accountName, fields.MetadataName: name, fc.ManagedResourceManagedServiceName: msvcName}, d.mresRepo)
 		}
 
 	default: