fix(GetItem): Make the force update item not full project ; update project item test to improve field value assertions

Author: rulasg

Test/public/project_item.test.ps1

@@ -9,60 +9,46 @@ function Test_GetProjectItem_SUCCESS{
 
 
     $itemId = "PVTI_lADOBCrGTM4ActQazgMuXXc"
-    $fieldTitleValue = "A draft in the project"
-    $fieldCommentValue = "This"
+    $projectFieldTitleValue = "A draft in the project"
+    $projectFieldCommentValue = "This"
+    $itemFieldTitleValue = "kk text"
+    $itemFieldCommentValue = "comment for draft 1"
 
-    # allow get project with skipitems
-    MockCall_GitHubOrgProjectWithFields -Owner $owner -ProjectNumber $projectNumber -FileName 'projectV2-skipitems.json' -skipitems
-
-    # Allow to get project with items for the FORCE
+    # allow get project
     MockCall_GitHubOrgProjectWithFields -Owner $owner -ProjectNumber $projectNumber -FileName 'projectV2.json'
-    $result = Get-ProjectItem -Owner $Owner -ProjectNumber $ProjectNumber -ItemId $itemId -Force
-
-    Assert-AreEqual -Expected $itemId -Presented $result.id
-    Assert-AreEqual -Expected $fieldCommentValue -Presented $result.$fieldComment
-    Assert-AreEqual -Expected $fieldTitleValue -Presented $result.$fieldTitle
-
-    # Edit to see the staged references
-    $fieldCommentValue = "new value of the comment 10.1"
-    $fieldTitleValue = "new value of the title 10.1"
-    Edit-ProjectItem -Owner $owner -ProjectNumber $projectNumber $itemId $fieldComment $fieldCommentValue
-    Edit-ProjectItem -Owner $owner -ProjectNumber $projectNumber $itemId $fieldTitle $fieldTitleValue
 
+    # Even if id is in project we make a direct call when with Force
+    MockCallJson -Command "Invoke-GetItem -itemid $itemId" -FileName "invoke-getitem-$itemId.json"
+    
+    # Act get value from project
     $result = Get-ProjectItem -Owner $Owner -ProjectNumber $ProjectNumber -ItemId $itemId
 
     Assert-AreEqual -Expected $itemId -Presented $result.id
-    Assert-AreEqual -Expected $fieldCommentValue -Presented $result.$fieldComment
-    Assert-AreEqual -Expected $fieldTitleValue -Presented $result.$fieldTitle
-}
+    Assert-AreEqual -Expected $projectFieldCommentValue -Presented $result.$fieldComment
+    Assert-AreEqual -Expected $projectFieldTitleValue -Presented $result.$fieldTitle
 
-function Test_GetProjectItem_SUCCESS_CacheItem{
-    Reset-InvokeCommandMock
-    Mock_DatabaseRoot
-
-    $Owner = "octodemo" ; $ProjectNumber = 700 ;
-    $itemId ="PVTI_lADOAlIw4c4BCe3Vzgeio4o"
+    # Act with force - get value from direct call
+    $result = Get-ProjectItem -Owner $Owner -ProjectNumber $ProjectNumber -ItemId $itemId -Force
 
-    # Cache project with no items
-    MockCall_GitHubOrgProjectWithFields -Owner $owner -ProjectNumber $ProjectNumber -skipitems -FileName "invoke-GitHubOrgProjectWithFields-octodemo-700-skipitems.json"
-    $null = Get-Project -Owner $Owner -ProjectNumber $ProjectNumber -SkipItems
+    Assert-AreEqual -Expected $itemId -Presented $result.id
+    Assert-AreEqual -Expected $itemFieldCommentValue -Presented $result.$fieldComment
+    Assert-AreEqual -Expected $itemFieldTitleValue -Presented $result.$fieldTitle
 
-    # Get item direct call
-    Set-InvokeCommandMock -Command "Get-MockFileContentJson -filename invoke-getitem-$itemId.json" -Alias "Invoke-GetItem -ItemId $itemId"
+    # Edit to see the staged references
+    $newFieldCommentValue = "new value of the comment 10.1"
+    $newFieldTitleValue = "new value of the title 10.1"
+    Edit-ProjectItem -Owner $owner -ProjectNumber $projectNumber $itemId $fieldComment $newFieldCommentValue
+    Edit-ProjectItem -Owner $owner -ProjectNumber $projectNumber $itemId $fieldTitle $newFieldTitleValue
 
-    # Act
+    # Act getting from cached project with staged values
     $result = Get-ProjectItem -Owner $Owner -ProjectNumber $ProjectNumber -ItemId $itemId
 
-    # Check return value is item
     Assert-AreEqual -Expected $itemId -Presented $result.id
-
-    # Check that the item is cached
-    # As the project db did not have any item, now it should have one
-    $db = Get-Project -Owner $Owner -ProjectNumber $ProjectNumber
-    Assert-Count -Expected 1 -Presented $db.items.Keys
-    Assert-IsNotNull -Object $db.items.$itemId
+    Assert-AreEqual -Expected $newFieldCommentValue -Presented $result.$fieldComment
+    Assert-AreEqual -Expected $newFieldTitleValue -Presented $result.$fieldTitle
 }
 
+
 function Test_EditProjetItems_SUCCESS{
     Reset-InvokeCommandMock
     Mock_DatabaseRoot

public/project_item.ps1

@@ -25,7 +25,7 @@ function Get-ProjectItem {
 
 
         # Get Item from Project database
-        $db = Get-Project -Owner $Owner -ProjectNumber $ProjectNumber -Force:$Force
+        $db = Get-Project -Owner $Owner -ProjectNumber $ProjectNumber
 
         # Durty flag
         $durty = $false
@@ -35,15 +35,19 @@ function Get-ProjectItem {
         if ($db) {
             $item = Get-Item $db $itemId
         }
-        if ($null -eq $item) {
-            "Item [$ItemId] not found in cache, fetching from API" | Write-Verbose
+
+        if (( ! $item ) -or $Force) {
+            "Fetching item [$ItemId] from API" | Write-Verbose
 
             # Get direct. No cache as we are in a database modification context
             $item = Get-ProjectItemDirect -ItemId $ItemId
 
             # Add to database
             Set-Item $db $item
             $durty = $true
+
+            # Get item again to allow the merge between staged and project fields
+            $item = Get-Item $db $itemId
         }
 
         return $item