Removed ContainerName actor; cleaned up container names in general.

ScottArbeit · Jul 28, 2024 · a0bb9ca · a0bb9ca
1 parent ad25fb0
commit a0bb9ca
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 186 deletions.
diff --git a/src/Grace.Actors/Branch.Actor.fs b/src/Grace.Actors/Branch.Actor.fs
@@ -61,7 +61,7 @@ module Branch =
                                 if basedOn <> ReferenceId.Empty then
                                     task {
                                         let referenceActorProxy = actorProxyFactory.CreateActorProxy<IReferenceActor>(Reference.GetActorId basedOn, ActorName.Reference)
-                                        return! referenceActorProxy.Get (branchEvent.Metadata.CorrelationId + $" Creating branch {branchName}")
+                                        return! referenceActorProxy.Get branchEvent.Metadata.CorrelationId
                                     }
                                 else
                                     ReferenceDto.Default |> returnTask
@@ -92,7 +92,7 @@ module Branch =
                     | Rebased referenceId ->
                         task {
                             let referenceActorProxy = actorProxyFactory.CreateActorProxy<IReferenceActor>(Reference.GetActorId referenceId, ActorName.Reference)
-                            let! referenceDto = referenceActorProxy.Get (branchEvent.Metadata.CorrelationId + "Rebasing branch")
+                            let! referenceDto = referenceActorProxy.Get branchEvent.Metadata.CorrelationId
                             return { currentBranchDto with BasedOn = referenceDto }
                         }
                     | NameSet branchName -> { currentBranchDto with BranchName = branchName } |> returnTask
@@ -159,9 +159,8 @@ module Branch =
                                     match basedOnLink with
                                     | ReferenceLinkType.BasedOn referenceId -> referenceId
 
-                                logToConsole $"In Branch.Actor.OnActivateAsync: basedOnReferenceId: {basedOnReferenceId}."
                                 let basedOnReferenceActorProxy = actorProxyFactory.CreateActorProxy<IReferenceActor>(Reference.GetActorId basedOnReferenceId, ActorName.Reference)
-                                let! basedOnReferenceDto = basedOnReferenceActorProxy.Get "Activating branch"
+                                let! basedOnReferenceDto = basedOnReferenceActorProxy.Get $"OnActivateAsync-{generateCorrelationId()}"
 
                                 branchDto <- { branchDto with BasedOn = basedOnReferenceDto }
                             | External -> ()
@@ -391,7 +390,7 @@ module Branch =
                         let referenceCommand = Reference.ReferenceCommand.Create referenceDto
                         match! referenceActor.Handle referenceCommand metadata with
                         | Ok _ ->
-                            let! referenceDto = referenceActor.Get (metadata.CorrelationId + "Adding reference")
+                            let! referenceDto = referenceActor.Get metadata.CorrelationId
                             return Ok referenceDto
                         | Error error -> return Error error
                     }
@@ -409,7 +408,7 @@ module Branch =
                                         if branchName <> InitialBranchName then
                                             // We need to get the reference that we're rebasing on, so we can get the directoryId and sha256Hash.
                                             let referenceActorProxy = actorProxyFactory.CreateActorProxy<IReferenceActor>(Reference.GetActorId basedOn, ActorName.Reference)
-                                            let! promotionDto = referenceActorProxy.Get (metadata.CorrelationId + "processCommand1")
+                                            let! promotionDto = referenceActorProxy.Get metadata.CorrelationId
 
                                             match! addReference repositoryId branchId promotionDto.DirectoryId promotionDto.Sha256Hash promotionDto.ReferenceText ReferenceType.Rebase [| ReferenceLinkType.BasedOn promotionDto.ReferenceId |] with
                                             | Ok rebaseReferenceId ->
@@ -434,7 +433,7 @@ module Branch =
 
                                         // We need to get the reference that we're rebasing on, so we can get the directoryId and sha256Hash.
                                         let referenceActorProxy = actorProxyFactory.CreateActorProxy<IReferenceActor>(ActorId($"{referenceId}"), ActorName.Reference)
-                                        let! promotionDto = referenceActorProxy.Get (metadata.CorrelationId + "processCommand2")
+                                        let! promotionDto = referenceActorProxy.Get metadata.CorrelationId
 
                                         // Add the Rebase reference to this branch.
                                         match! addReferenceToCurrentBranch promotionDto.DirectoryId promotionDto.Sha256Hash promotionDto.ReferenceText ReferenceType.Rebase [| ReferenceLinkType.BasedOn promotionDto.ReferenceId |] with

diff --git a/src/Grace.Actors/Constants.Actor.fs b/src/Grace.Actors/Constants.Actor.fs
@@ -17,9 +17,6 @@ module Constants =
         [<Literal>]
         let Checkpoint = "CheckpointActor"
 
-        [<Literal>]
-        let ContainerName = "ContainerNameActor"
-
         [<Literal>]
         let Diff = "DiffActor"
 

diff --git a/src/Grace.Actors/ContainerName.Actor.fs b/src/Grace.Actors/ContainerName.Actor.fs
diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -343,7 +343,10 @@ module DirectoryVersion =
                                         ))
                                 )
 
-                            let subdirectoryVersionsList = subdirectoryVersions.ToArray()
+                            let subdirectoryVersionsList =
+                                subdirectoryVersions.ToArray()
+                                    |> Array.sortBy(fun directoryVersion -> directoryVersion.RelativePath)
+                            logToConsole $"In DirectoryVersionActor.GetDirectoryVersionsRecursive({this.Id}); Storing subdirectoryVersion list."
                             do! Storage.SaveState stateManager directoryVersionCacheStateName subdirectoryVersionsList
 
                             log.LogDebug("In DirectoryVersionActor.GetDirectoryVersionsRecursive({id}); Storing subdirectoryVersion list.", this.Id)

diff --git a/src/Grace.Actors/Grace.Actors.fsproj b/src/Grace.Actors/Grace.Actors.fsproj
@@ -35,7 +35,6 @@
 		<Compile Include="Repository.Actor.fs" />
 		<Compile Include="RepositoryName.Actor.fs" />
 		<Compile Include="RepositoryPermission.Actor.fs" />
-		<Compile Include="ContainerName.Actor.fs" />
 		<Compile Include="Diff.Actor.fs" />
 		<Compile Include="FileAppearance.Actor.fs" />
 		<Compile Include="DirectoryAppearance.Actor.fs" />

diff --git a/src/Grace.Actors/Interfaces.Actor.fs b/src/Grace.Actors/Interfaces.Actor.fs
@@ -87,16 +87,6 @@ module Interfaces =
         /// Sets the BranchId that matches the BranchName.
         abstract member SetBranchId: branchId: BranchId -> correlationId: CorrelationId -> Task
 
-    /// Defines the operations for the Commit actor.
-    [<Interface>]
-    type IContainerNameActor =
-        inherit IActor
-
-        /// Retrieves the container name for the RepositoryId specified for the actor.
-        ///
-        /// The container name is $"{ownerName}-{organizationName}-{repositoryName}".
-        abstract member GetContainerName: correlationId: CorrelationId -> Task<Result<ContainerName, string>>
-
     /// Defines the operations for the Diff actor.
     [<Interface>]
     type IDiffActor =

diff --git a/src/Grace.Actors/Repository.Actor.fs b/src/Grace.Actors/Repository.Actor.fs
@@ -158,7 +158,7 @@ module Repository =
                         OrganizationId = organizationId
                         ObjectStorageProvider = Constants.DefaultObjectStorageProvider
                         StorageAccountName = Constants.DefaultObjectStorageAccount
-                        StorageContainerName = StorageContainerName Constants.DefaultObjectStorageContainerName
+                        StorageContainerName = $"{repositoryId}"
                         CreatedAt = repositoryEvent.Metadata.Timestamp
                     }
                 | Initialized -> { currentRepositoryDto with InitializedAt = Some(getCurrentInstant ()) }