Added missing scope (#14711)

umbraco · Aug 23, 2023 · 98bcf15 · 98bcf15
1 parent 6f10517
commit 98bcf15
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/...braco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs b/...braco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
@@ -168,7 +168,12 @@ public IEnumerable<PackageDefinition> GetAll()
             .From<CreatedPackageSchemaDto>()
             .Where<CreatedPackageSchemaDto>(x => x.PackageId == key);
 
-        List<CreatedPackageSchemaDto> schemaDtos = Database.Fetch<CreatedPackageSchemaDto>(query);
+        if (_scopeAccessor.AmbientScope is null)
+        {
+            return null;
+        }
+
+        List<CreatedPackageSchemaDto> schemaDtos = _scopeAccessor.AmbientScope.Database.Fetch<CreatedPackageSchemaDto>(query);
 
         if (schemaDtos.IsCollectionEmpty())
         {
@@ -215,7 +220,13 @@ public bool SavePackage(PackageDefinition? definition)
                     .SelectCount()
                     .From<CreatedPackageSchemaDto>()
                     .Where<CreatedPackageSchemaDto>(x => x.Name == definition.Name);
-            var exists = Database.ExecuteScalar<int>(query);
+
+            if (_scopeAccessor.AmbientScope is null)
+            {
+                return false;
+            }
+
+            var exists = _scopeAccessor.AmbientScope.Database.ExecuteScalar<int>(query);
 
             if (exists > 0)
             {

diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
@@ -161,7 +161,12 @@ public async Task<PagedModel<PackageDefinition>> GetCreatedPackagesAsync(int ski
     }
 
     /// <inheritdoc/>
-    public Task<PackageDefinition?> GetCreatedPackageByKeyAsync(Guid key) => Task.FromResult(_createdPackages.GetByKey(key));
+    public Task<PackageDefinition?> GetCreatedPackageByKeyAsync(Guid key)
+    {
+        using ICoreScope scope = _coreScopeProvider.CreateCoreScope(autoComplete: true);
+
+        return Task.FromResult(_createdPackages.GetByKey(key));
+    }
 
     [Obsolete("Use CreateCreatedPackageAsync or UpdateCreatedPackageAsync instead. Scheduled for removal in Umbraco 15.")]
     public bool SaveCreatedPackage(PackageDefinition definition)
@@ -197,13 +202,15 @@ public bool SaveCreatedPackage(PackageDefinition definition)
     /// <inheritdoc/>
     public async Task<Attempt<PackageDefinition, PackageOperationStatus>> UpdateCreatedPackageAsync(PackageDefinition package, Guid userKey)
     {
+        using ICoreScope scope = _coreScopeProvider.CreateCoreScope();
         if (_createdPackages.SavePackage(package) == false)
         {
             return Attempt.FailWithStatus(PackageOperationStatus.NotFound, package);
         }
 
         int currentUserId = _userService.GetAsync(userKey).Result?.Id ?? Constants.Security.SuperUserId;
         _auditService.Add(AuditType.New, currentUserId, -1, "Package", $"Created package '{package.Name}' updated. Package key: {package.PackageId}");
+        scope.Complete();
         return await Task.FromResult(Attempt.SucceedWithStatus(PackageOperationStatus.Success, package));
     }