fix(Conflict):fix conflicts.

Star-Academy · Sep 9, 2024 · e52f78a · e52f78a
2 parents 0586d76 + 4bd0086
commit e52f78a
Show file tree

Hide file tree

Showing 30 changed files with 636 additions and 168 deletions.
diff --git a/.github/workflows/dotnetCI_release.yml b/.github/workflows/dotnetCI_release.yml
@@ -47,10 +47,10 @@ jobs:
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/dotnetdev:${{ steps.tag_version.outputs.new_tag }}
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/dotnetdev:latest .
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/dotnetdev:latest
-          docker build -f=Dockerfile2 -t ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:${{ steps.tag_version.outputs.new_tag }} .  
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:${{ steps.tag_version.outputs.new_tag }}
-          docker build -f=Dockerfile2 -t ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:latest .
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:latest
+          # docker build -f=Dockerfile2 -t ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:${{ steps.tag_version.outputs.new_tag }} .  
+          # docker push ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:${{ steps.tag_version.outputs.new_tag }}
+          # docker build -f=Dockerfile2 -t ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:latest .
+          # docker push ${{ secrets.DOCKERHUB_USERNAME }}/migrateimage:latest
           
   update-helm:
     runs-on: ubuntu-latest

diff --git a/AnalysisData/AnalysisData.sln.DotSettings.user b/AnalysisData/AnalysisData.sln.DotSettings.user
@@ -1,42 +1,12 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\kimia\AppData\Local\JetBrains\Rider2024.1\resharper-host\temp\Rider\vAny\CoverageData\_AnalysisData.-35481945\Snapshot\snapshot.utdcvr</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=098e78e2_002D707b_002D4922_002D926d_002Dcb148189e0cf/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="CheckExistenceOfRole_ShouldTNothrowRoleNotFoundException_WhenRoleExist" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;Project Location="E:\CodeStar1403\Summer1403-Project-Group03-Backend\AnalysisData\TestProject" Presentation="&amp;lt;TestProject&amp;gt;" /&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=0a0c68cd_002D6612_002D4ee1_002Da4be_002D74d8338333c4/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GetUploadedFilesAsync_ShouldReturnCorrectPagedFiles_WhenFilesExist" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetUploadedFilesAsync_ShouldReturnCorrectPagedFiles_WhenFilesExist&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::UserFileRepositoryTests.GetByFileIdAsync_ShouldReturnUserFiles_WhenFileIdExists&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetAllAsync_ShouldReturnAllFiles_WhenFilesExist&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::UserFileRepositoryTests&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::UserRepositoryTests&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetNumberOfFileWithCategoryIdAsync_ShouldReturnCorrectCount_WhenCategoryIdExists&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetTotalFilesCountAsync_ShouldReturnCorrectTotalCount_Whenever&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetByUserIdAsync_ShouldReturnEmpty_WhenUserIdDoesNotExist&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetByUserIdAsync_ShouldReturnFiles_WhenUserIdExists&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetByIdAsync_ShouldReturnNull_WhenIdDoesNotExist&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=219940aa_002Df21c_002D44cf_002D9307_002Dab482de92a14/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="RoleRepositoryTests" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Repository.RoleRepository.RoleRepositoryTests&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=22738958_002Da36f_002D4ca4_002Db394_002D396e1cf1b1f0/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GetByFileIdAsync_ShouldReturnUserFiles_WhenFileIdExists" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=31805794_002Dfd1c_002D4220_002Db413_002D166aeedc2c10/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="AddAsync_ShouldAddFileEntityToDatabase_Whenever" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;Project Location="E:\CodeStar1403\Summer1403-Project-Group03-Backend\AnalysisData\TestProject" Presentation="&amp;lt;TestProject&amp;gt;" /&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=36bad8bd_002D26ce_002D4088_002Dbba7_002Dc82415c09c37/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GetByIdAsync_ShouldReturnFileEntity_WhenIdExists" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetByIdAsync_ShouldReturnFileEntity_WhenIdExists&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetAllAsync_ShouldReturnAllFiles_WhenFilesExist&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::FileUploadedRepositoryTests.GetUploadedFilesAsync_ShouldReturnCorrectPagedFiles_WhenFilesExist&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=219940aa_002Df21c_002D44cf_002D9307_002Dab482de92a14/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="RoleRepositoryTests" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;Project Location="C:\Users\Mahdi\Desktop\code star proje\Summer1403-Project-Group03-Backend\AnalysisData\TestProject" Presentation="&amp;lt;TestProject&amp;gt;" /&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=5a6db5c4_002D6b10_002D4bf8_002D8325_002D71b5cea4c333/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="UpdateCategory_ShouldReturnOk_WhenCategoryIsUpdatedSuccessfully" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=5a6db5c4_002D6b10_002D4bf8_002D8325_002D71b5cea4c333/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="UpdateCategory_ShouldReturnOk_WhenCategoryIsUpdatedSuccessfully" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;Project Location="C:\Users\Mahdi\Desktop\code star proje\Summer1403-Project-Group03-Backend\AnalysisData\TestProject" Presentation="&amp;lt;TestProject&amp;gt;" /&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=7500013c_002De743_002D474e_002Db412_002D6de4ada69526/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="GetEdgeAttributeValues_ShouldReturnEdgeInformationDtos_WhenEdgeAttributeValuesExist" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;