Fix merge conflict (#203)

Ed-Fi-Alliance-OSS · Dec 17, 2024 · 36daf24 · 36daf24
1 parent 28d024e
commit 36daf24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Application/EdFi.Ods.AdminApi/AdminConsole/InstanceService.cs b/Application/EdFi.Ods.AdminApi/AdminConsole/InstanceService.cs
@@ -61,11 +61,11 @@ public async Task InitializeIntancesAsync(int tenantId)
         foreach (var odsInstance in odsInstances)
         {
             //check if exist
-            if (!instancesAdminConsole.Any(x => x.InstanceId == odsInstance.OdsInstanceId))
+            if (!instancesAdminConsole.Any(x => x.OdsInstanceId == odsInstance.OdsInstanceId))
             {
                 //create
                 AddInstanceRequest addInstanceRequest = new AddInstanceRequest();
-                addInstanceRequest.InstanceId = odsInstance.OdsInstanceId;
+                addInstanceRequest.OdsInstanceId = odsInstance.OdsInstanceId;
                 addInstanceRequest.TenantId = tenantId;
                 var odsContexts = odsInstanceContexts.Where(x => x.OdsInstanceId == odsInstance.OdsInstanceId);
                 var odsDerivatives = odsInstanceDerivatives.Where(x => x.OdsInstanceId == odsInstance.OdsInstanceId);

diff --git a/Application/EdFi.Ods.AdminConsole.DBTests/Database/CommandTests/EditInstanceCommandTests.cs b/Application/EdFi.Ods.AdminConsole.DBTests/Database/CommandTests/EditInstanceCommandTests.cs
@@ -47,7 +47,6 @@ public void Init()
     [Test]
     public void ShouldEditInstance()
     {
-        var TenantId = 1;
         var Document = "{\"name\": \"Instance #4 - 2024\",\"instanceType\": null}\r\n";
 
         var options = new JsonSerializerOptions
@@ -59,7 +58,6 @@ public void ShouldEditInstance()
         ExpandoObject documentExpandObject = JsonSerializer.Deserialize<ExpandoObject>(Document, options);
 
         var newInstanceData = new Mock<IEditInstanceModel>();
-        newInstanceData.Setup(v => v.TenantId).Returns(TenantId);
         newInstanceData.Setup(v => v.Document).Returns(documentExpandObject);
 
         var encryptionService = new EncryptionService();
@@ -68,7 +66,8 @@ public void ShouldEditInstance()
         Transaction(async dbContext =>
         {
             var repository = new CommandRepository<Instance>(dbContext);
-            var command = new EditInstanceCommand(repository, Testing.GetEncryptionKeyResolver(), encryptionService);
+            var qRepository = new QueriesRepository<Instance>(dbContext);
+            var command = new EditInstanceCommand(repository, qRepository, Testing.GetEncryptionKeyResolver(), encryptionService);
 
             var result = await command.Execute(_odsInstanceId, newInstanceData.Object);
         });