Merge pull request #259 from Resgrid/develop

Develop

Author: ucswift

.github/workflows/changerawr-sync.yml

@@ -0,0 +1,76 @@
+name: Sync PR to Changerawr
+permissions:
+  contents: read
+  issues: write
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+jobs:
+  post-to-changerawr:
+    # Only run if the PR was merged (not just closed)
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Post to Changerawr API
+      uses: actions/github-script@v7
+      env:
+        CHANGERAWR_API_KEY: ${{ secrets.CHANGERAWR_API_KEY }}
+        CHANGERAWR_PROJECT_ID: ${{ secrets.CHANGERAWR_PROJECT_ID }}
+      with:
+        script: |
+          const prBody = context.payload.pull_request.body || '';
+          const prNumber = context.payload.pull_request.number;
+          const prTitle = context.payload.pull_request.title;
+          const prUrl = context.payload.pull_request.html_url;
+          
+          // Prepare the payload for Changerawr API
+          const payload = {
+            notes: prBody,
+            metadata: {
+              pr_number: prNumber,
+              pr_title: prTitle,
+              pr_url: prUrl,
+              merged_at: context.payload.pull_request.merged_at,
+              merged_by: context.payload.pull_request.merged_by?.login || 'unknown'
+            }
+          };
+          
+          try {
+            const response = await fetch(
+              `https://clog.resgrid.com/api/projects/${process.env.CHANGERAWR_PROJECT_ID}/changelog`,
+              {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                  'Authorization': `Bearer ${process.env.CHANGERAWR_API_KEY}`
+                },
+                body: JSON.stringify(payload)
+              }
+            );
+            
+            if (!response.ok) {
+              const errorText = await response.text();
+              throw new Error(`Changerawr API request failed: ${response.status} - ${errorText}`);
+            }
+            
+            const result = await response.json();
+            console.log('Successfully posted to Changerawr:', result);
+            
+            // Optionally, comment on the PR with confirmation
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: '✅ Change notes have been posted to Changerawr.'
+            });
+            
+          } catch (error) {
+            console.error('Error posting to Changerawr:', error);
+            core.setFailed(`Failed to post to Changerawr: ${error.message}`);
+          }

Core/Resgrid.Services/SubscriptionsService.cs

@@ -99,10 +99,10 @@ public async Task<DepartmentPlanCount> GetPlanCountsForDepartmentAsync(int depar
 				var response = await client.ExecuteAsync<GetPlanCountsForDepartmentResult>(request);
 
 				if (response.StatusCode == HttpStatusCode.NotFound)
-					return null;
+					return new DepartmentPlanCount();
 
 				if (response.Data == null)
-					return null;
+					return new DepartmentPlanCount();
 
 				return response.Data.Data;
 			}

Repositories/Resgrid.Repositories.NoSqlRepository/MongoRepository.cs

@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using Resgrid.Model;
 using Resgrid.Config;
-using System.Runtime.CompilerServices;
 using MongoDB.Driver.Linq;
 
 namespace Resgrid.Repositories.NoSqlRepository

Web/Resgrid.Web.Services/Controllers/v4/MappingController.cs

@@ -102,7 +102,8 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()
 			var callTypes = await _callsService.GetCallTypesForDepartmentAsync(DepartmentId);
 
 			var personnelStates = await _actionLogsService.GetLastActionLogsForDepartmentAsync(DepartmentId);
-			var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
+			//var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);
+			var people = await _usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId, false, false, false);
 			var personnelLocations = await _usersService.GetLatestLocationsForDepartmentPersonnelAsync(DepartmentId);
 
 			var personnelLocationTTL = await _departmentSettingsService.GetMappingPersonnelLocationTTLAsync(DepartmentId);
@@ -373,9 +374,9 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()
 				}
 			}
 
-			if (personnelNames != null && personnelNames.Any())
+			if (people != null && people.Any())
 			{
-				foreach (var person in personnelNames)
+				foreach (var person in people)
 				{
 					if (!await _authorizationService.CanUserViewPersonLocationViaMatrixAsync(person.UserId, UserId, DepartmentId))
 						continue;