Merge pull request #784 from bcgov/yj

ychung-mot · web-flow · commit 13ebb47a4bba · 2024-11-13T14:44:38.000-08:00
fix: LG to be able to see listing upload history
diff --git a/server/StrDss.Data/Repositories/UploadDeliveryRepository.cs b/server/StrDss.Data/Repositories/UploadDeliveryRepository.cs
@@ -151,8 +151,14 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
         {
             var query = _dbContext.DssRentalUploadHistoryViews.AsNoTracking();
 
-            if (_currentUser.OrganizationType != OrganizationTypes.BCGov)
+            if (reportTypes.Contains(UploadDeliveryTypes.LicenceData) && _currentUser.OrganizationType != OrganizationTypes.BCGov)
+            {
+                query = query.Where(x => x.ProvidingOrganizationId == _currentUser.OrganizationId);
+            }
+            else if (_currentUser.OrganizationType != OrganizationTypes.BCGov && _currentUser.OrganizationType != OrganizationTypes.LG)
+            {
                 query = query.Where(x => x.ProvidingOrganizationId == _currentUser.OrganizationId);
+            }
 
             if (orgId != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,14 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,`
`151`	`151`	`{`
`152`	`152`	`var query = _dbContext.DssRentalUploadHistoryViews.AsNoTracking();`
`153`	`153`
`154`		`- if (_currentUser.OrganizationType != OrganizationTypes.BCGov)`
	`154`	`+ if (reportTypes.Contains(UploadDeliveryTypes.LicenceData) && _currentUser.OrganizationType != OrganizationTypes.BCGov)`
	`155`	`+ {`
	`156`	`+ query = query.Where(x => x.ProvidingOrganizationId == _currentUser.OrganizationId);`
	`157`	`+ }`
	`158`	`+ else if (_currentUser.OrganizationType != OrganizationTypes.BCGov && _currentUser.OrganizationType != OrganizationTypes.LG)`
	`159`	`+ {`
`155`	`160`	`query = query.Where(x => x.ProvidingOrganizationId == _currentUser.OrganizationId);`
	`161`	`+ }`
`156`	`162`
`157`	`163`	`if (orgId != null)`
`158`	`164`	`{`