Activity log implementation in the UI

nitin27may · nitin27may · commit 14d1e09d3365 · 2025-04-09T15:23:49.000-04:00
diff --git a/backend/scripts/seed-data.sql b/backend/scripts/seed-data.sql
@@ -5,6 +5,8 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 CREATE TABLE IF NOT EXISTS "ActivityLog" (
     "Id" UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
     "UserId" UUID NOT NULL,
+    "Username" VARCHAR(250) NOT NULL,
+    "Email" VARCHAR(250) NOT NULL,
     "Activity" VARCHAR(250) NOT NULL,
     "Endpoint" VARCHAR(250) NOT NULL,
     "HttpMethod" VARCHAR(10) NOT NULL,
@@ -132,7 +134,8 @@ INSERT INTO "Operations" ("Id", "Name", "Description", "CreatedOn", "CreatedBy")
 -- Insert data into Pages table
 INSERT INTO "Pages" ("Id", "Name", "Url", "CreatedOn", "CreatedBy") VALUES
 ('aa56a391-e880-4ac5-9f6f-6c8aa33454b8', 'Contacts', '/contacts', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb'),
-('c4943131-a642-4352-9725-e44ba5972b4b', 'Users', '/users', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb');
+('c4943131-a642-4352-9725-e44ba5972b4b', 'Users', 'admin/users', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb'),
+('c4943131-a642-4352-9725-e44ba5972b4c', 'ActivityLog', 'admin/activity-logs', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb');
 
 -- Insert data into Roles table
 INSERT INTO "Roles" ("Id", "Name", "Description", "CreatedOn", "CreatedBy") VALUES
@@ -165,7 +168,7 @@ INSERT INTO "Permissions" ("Id", "PageId", "OperationId", "Description", "Create
 ('c94c23ad-59d4-4f80-91ee-39316140db17', 'c4943131-a642-4352-9725-e44ba5972b4b', 'dce8d805-df41-4549-be7b-6ed5647b09c3', 'User Update', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb'),
 ('82755e66-b743-46e2-b612-efd2db6bcd75', 'c4943131-a642-4352-9725-e44ba5972b4b', '7493f274-5007-4e17-9840-88c9a096422f', 'User Read', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb'),
 ('82755e66-b743-46e2-b612-efd2db6bce75', 'c4943131-a642-4352-9725-e44ba5972b4b', 'cef15d6f-25e4-422b-a7d6-405aaa2de2d5', 'User Delete', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb'),
-('d35daa4e-fd02-4934-98d2-5b06e9b694b9', 'c4943131-a642-4352-9725-e44ba5972b4b', '7493f274-5007-4e17-9840-88c9a096422f', 'ActivityLog Read', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb');
+('d35daa4e-fd02-4934-98d2-5b06e9b694b9', 'c4943131-a642-4352-9725-e44ba5972b4c', '7493f274-5007-4e17-9840-88c9a096422f', 'ActivityLog Read', NOW(), '26402b6c-ebdd-44c3-9188-659a134819cb');
 
 -- Set up admin role permissions
 INSERT INTO "RolePermissions" ("RoleId", "PermissionId", "CreatedOn", "CreatedBy") VALUES
diff --git a/backend/src/Contact.Api/Controllers/UsersController.cs b/backend/src/Contact.Api/Controllers/UsersController.cs
@@ -107,12 +107,27 @@ public async Task<IActionResult> ChangePassword(ChangePassword changePassword)
         return Ok(result);
     }
 
-    [HttpGet("activity-logs")]
+[HttpGet("activity-logs")]
     [Authorize]
     [AuthorizePermission("ActivityLog.Read")]
-    public async Task<IActionResult> GetActivityLogs([FromQuery] string username, [FromQuery] string email)
+    public async Task<IActionResult> GetActivityLogs([FromQuery] string username = "", [FromQuery] string email = "")
     {
-        var logs = await _activityLogService.GetActivityLogsAsync(username, email);
-        return Ok(logs);
+        // Ensure parameters are not null
+        username = username ?? "";
+        email = email ?? "";
+        
+        // Trim parameters to remove any whitespace
+        username = username.Trim();
+        email = email.Trim();
+        
+        try
+        {
+            var logs = await _activityLogService.GetActivityLogsAsync(username, email);
+            return Ok(logs);
+        }
+        catch (Exception ex)
+        {
+            return BadRequest(new { message = $"Error retrieving activity logs: {ex.Message}" });
+        }
     }
 }
diff --git a/backend/src/Contact.Api/Core/Middleware/ActivityLoggingMiddleware.cs b/backend/src/Contact.Api/Core/Middleware/ActivityLoggingMiddleware.cs
@@ -27,14 +27,22 @@ public async Task InvokeAsync(HttpContext context)
             using (var scope = _serviceProvider.CreateScope())
             {
                 var activityLogService = scope.ServiceProvider.GetRequiredService<IActivityLogService>();
-                var userIdClaim = context.User.FindFirst("id");
+                
+                // Safely extract claims from User context
+                var userIdClaim = context.User.FindFirst("Id");
                 var userId = userIdClaim != null ? Guid.Parse(userIdClaim.Value) : Guid.Empty;
-                var username = context.User.Identity?.Name;
-                var email = context.User.FindFirst(ClaimTypes.Email)?.Value;
+                
+                var username = context.User.Identity?.Name ?? "Anonymous";
+                
+                // Safely extract email claim
+                var emailClaim = context.User.FindFirst(System.Security.Claims.ClaimTypes.Email) 
+                    ?? context.User.FindFirst("Email");
+                var email = emailClaim?.Value ?? "unknown@example.com";
+                
                 var activityDescription = activityAttribute.ActivityDescription;
                 var endpointPath = context.Request.Path;
                 var httpMethod = context.Request.Method;
-                var ipAddress = context.Connection.RemoteIpAddress?.ToString();
+                var ipAddress = context.Connection.RemoteIpAddress?.ToString() ?? "Unknown";
                 var userAgent = context.Request.Headers["User-Agent"].ToString();
 
                 var logEntry = new ActivityLogEntry
diff --git a/backend/src/Contact.Api/Program.cs b/backend/src/Contact.Api/Program.cs
@@ -1,7 +1,6 @@
 using Contact.Api.Core.Authorization;
 using Contact.Api.Core.Middleware;
 using Contact.Application;
-using Contact.Application.Interfaces;
 using Contact.Infrastructure;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
@@ -77,6 +76,7 @@
     app.UseSwaggerUI();
 }
 app.UseMiddleware<ExceptionMiddleware>();
+app.UseMiddleware<ActivityLoggingMiddleware>();
 app.UseHttpsRedirection();
 
 app.UseAuthorization();
diff --git a/backend/src/Contact.Application/ApplicationServiceCollectionExtensions.cs b/backend/src/Contact.Application/ApplicationServiceCollectionExtensions.cs
@@ -26,6 +26,7 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
         services.AddScoped<IPermissionService, PermissionService>();
         services.AddScoped<IRolePermissionService, RolePermissionService>();
         services.AddScoped<IContactPersonService,ContactPersonService>();
+        services.AddScoped<IActivityLogService,ActivityLogService>();
         return services;
     }
 }
diff --git a/backend/src/Contact.Application/UseCases/Users/RolePermissionResponse.cs b/backend/src/Contact.Application/UseCases/Users/RolePermissionResponse.cs
@@ -5,5 +5,6 @@ public class RolePermissionResponse
 {
     public string RoleName { get; set; }
     public string PageName { get; set; }
+    public string PageUrl { get; set; }
     public string OperationName { get; set; }
 }
diff --git a/backend/src/Contact.Domain/Entities/RolePermissionMapping.cs b/backend/src/Contact.Domain/Entities/RolePermissionMapping.cs
@@ -4,5 +4,6 @@ public class RolePermissionMapping : BaseEntity
 {
     public string RoleName { get; set; }
     public string PageName { get; set; }
+    public string PageUrl { get; set; }
     public string OperationName { get; set; }
 }
diff --git a/backend/src/Contact.Infrastructure/Persistence/Repositories/ActivityLogRepository.cs b/backend/src/Contact.Infrastructure/Persistence/Repositories/ActivityLogRepository.cs
@@ -42,8 +42,8 @@ public async Task<IEnumerable<ActivityLogEntry>> GetActivityLogsAsync(string use
         var sql = @"
             SELECT * FROM ""ActivityLog""
             WHERE (""Username"" = @Username OR @Username IS NULL)
-            AND (""Email"" = @Email OR @Email IS NULL)";
+            OR (""Email"" = @Email OR @Email IS NULL)";
 
-        return await _dapperHelper.Query<ActivityLogEntry>(sql, dbPara, CommandType.Text);
+        return await _dapperHelper.GetAll<ActivityLogEntry>(sql, dbPara, CommandType.Text);
     }
 }
diff --git a/backend/src/Contact.Infrastructure/Persistence/Repositories/RolePermissionRepository.cs b/backend/src/Contact.Infrastructure/Persistence/Repositories/RolePermissionRepository.cs
@@ -39,7 +39,7 @@ public async Task<IEnumerable<RolePermissionMapping>> GetRolePermissionMappingsA
                 r.""Name"" AS RoleName,
                 p.""Id"" as PageId,
                 p.""Name"" AS PageName,
-                p.""Url"" as Route,
+                p.""Url"" as PageUrl,
                 o.""Id"" as OperationId,
                 o.""Name"" AS OperationName
             FROM ""UserRoles"" ur
diff --git a/frontend/src/app/@core/layout/custom-sidenav/menu-items.ts b/frontend/src/app/@core/layout/custom-sidenav/menu-items.ts
@@ -35,19 +35,30 @@ export class MenuService {
       return menuItems;
     }
 
-    // Get unique pages from permissions
-    const uniquePages = [...new Set(user.rolePermissions.map(p => p.pageName))];
+    // Create a map to store unique page information
+    const pageMap = new Map<string, { name: string, url: string }>();
 
-    // Create menu items based on permissions
-    uniquePages.forEach(pageName => {
+    // Process all role permissions to get unique pages with their URLs
+    user.rolePermissions.forEach(p => {
+      if (!pageMap.has(p.pageName)) {
+        pageMap.set(p.pageName, {
+          name: p.pageName,
+          // Use pageUrl if available, fallback to lowercase page name
+          url: p.pageUrl || `/${p.pageName.toLowerCase()}`
+        });
+      }
+    });
+
+    // Create menu items based on pages and permissions
+    pageMap.forEach((pageInfo, pageName) => {
       if (pageName.toLowerCase() === 'dashboard') return;
 
       const operations = this.permissionService.getPagePermissions(pageName);
       if (operations.includes('Read')) {
         menuItems.push({
           icon: this.getIconForPage(pageName),
           label: this.formatLabel(pageName),
-          route: `/${pageName.toLowerCase()}`,
+          route: pageInfo.url,
           exact: false,
           permission: `${pageName}.Read`
         });
diff --git a/frontend/src/app/@core/models/permission.interface.ts b/frontend/src/app/@core/models/permission.interface.ts
@@ -1,6 +1,7 @@
 export interface RolePermission {
     roleName: string;
     pageName: string;
+    pageUrl: string;
     operationName: string;
 }
 
@@ -12,4 +13,4 @@ export interface UserWithPermissions {
     mobile: string;
     email: string;
     rolePermissions: RolePermission[];
-}
+}
diff --git a/frontend/src/app/@core/services/user.service.ts b/frontend/src/app/@core/services/user.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
+import { HttpClient, HttpParams } from "@angular/common/http";
 import { map } from "rxjs/operators";
 import { User } from "@core/models/user.interface";
 
@@ -62,9 +62,24 @@ export class UserService {
     return this.http.delete(environment.apiEndpoint + "/user/" + _id);
   }
 
-  getActivityLogs(username: string, email: string) {
-    return this.http.get<any[]>(`${environment.apiEndpoint}/users/activity-logs`, {
-      params: { username, email }
-    });
+  getActivityLogs(username: string = '', email: string | null = null) {
+    // Create params object and only add non-empty values
+    let params = new HttpParams();
+
+    if (username) {
+      params = params.set('username', username);
+    }
+
+    if (email) {
+      params = params.set('email', email);
+    }
+
+    return this.http.get<any[]>(`${environment.apiEndpoint}/users/activity-logs`, { params })
+      .pipe(
+        map(response => {
+          console.log('Activity logs response:', response);
+          return response;
+        })
+      );
   }
 }
diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts
@@ -5,7 +5,7 @@ export const routes: Routes = [
     loadChildren: () => import('@features/contact/contact.routes'),
   },
   {
-    path: 'users',
+    path: 'admin',
     loadChildren: () => import('@features/admin/admin.routes'),
   },
   {
diff --git a/frontend/src/app/feature/admin/activity-log/activity-log.component.html b/frontend/src/app/feature/admin/activity-log/activity-log.component.html
@@ -40,7 +40,7 @@ <h1 class="text-2xl font-bold">Activity Logs</h1>
           </tr>
         </thead>
         <tbody class="bg-white divide-y divide-gray-200">
-          <tr *ngFor="let log of activityLogs">
+          <tr *ngFor="let log of activityLogs()">
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ log.username }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ log.email }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ log.activity }}</td>
diff --git a/frontend/src/app/feature/admin/activity-log/activity-log.component.ts b/frontend/src/app/feature/admin/activity-log/activity-log.component.ts
@@ -1,17 +1,25 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { Component, inject, OnInit, signal } from '@angular/core';
+import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { UserService } from '@core/services/user.service';
+import { DatePipe, NgFor } from '@angular/common';
 
 @Component({
   selector: 'app-activity-log',
   templateUrl: './activity-log.component.html',
-  styleUrls: ['./activity-log.component.scss']
+  styleUrls: ['./activity-log.component.scss'],
+  standalone: true,
+  imports: [
+    ReactiveFormsModule,
+    DatePipe,
+    NgFor
+  ]
 })
 export class ActivityLogComponent implements OnInit {
-  filterForm: FormGroup;
-  activityLogs: any[] = [];
+  private fb = inject(FormBuilder);
+  private userService = inject(UserService);
 
-  constructor(private fb: FormBuilder, private userService: UserService) {}
+  filterForm!: FormGroup;
+  activityLogs = signal<any[]>([]);
 
   ngOnInit(): void {
     this.filterForm = this.fb.group({
@@ -22,8 +30,10 @@ export class ActivityLogComponent implements OnInit {
 
   onFilter(): void {
     const { username, email } = this.filterForm.value;
-    this.userService.getActivityLogs(username, email).subscribe(logs => {
-      this.activityLogs = logs;
+    this.userService.getActivityLogs(username, email).subscribe({
+      next: (logs) => {
+        this.activityLogs.set(logs);
+      }
     });
   }
 }
diff --git a/frontend/src/app/feature/admin/admin.routes.ts b/frontend/src/app/feature/admin/admin.routes.ts
@@ -12,7 +12,7 @@ export default [
     canActivate: [redirectToLoginIfNotAuthenticated()],
     children: [
       {
-        path: '',
+        path: 'users',
         component: UserListComponent,
         canActivate: [PermissionGuard('Users', 'Read')]
       },

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection`
`26`	`26`	`services.AddScoped<IPermissionService, PermissionService>();`
`27`	`27`	`services.AddScoped<IRolePermissionService, RolePermissionService>();`
`28`	`28`	`services.AddScoped<IContactPersonService,ContactPersonService>();`
	`29`	`+ services.AddScoped<IActivityLogService,ActivityLogService>();`
`29`	`30`	`return services;`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ public class RolePermissionResponse`
`5`	`5`	`{`
`6`	`6`	`public string RoleName { get; set; }`
`7`	`7`	`public string PageName { get; set; }`
	`8`	`+ public string PageUrl { get; set; }`
`8`	`9`	`public string OperationName { get; set; }`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ public class RolePermissionMapping : BaseEntity`
`4`	`4`	`{`
`5`	`5`	`public string RoleName { get; set; }`
`6`	`6`	`public string PageName { get; set; }`
	`7`	`+ public string PageUrl { get; set; }`
`7`	`8`	`public string OperationName { get; set; }`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public async Task<IEnumerable<ActivityLogEntry>> GetActivityLogsAsync(string use`
`42`	`42`	`var sql = @"`
`43`	`43`	`SELECT * FROM ""ActivityLog""`
`44`	`44`	`WHERE (""Username"" = @Username OR @Username IS NULL)`
`45`		`- AND (""Email"" = @Email OR @Email IS NULL)";`
	`45`	`+ OR (""Email"" = @Email OR @Email IS NULL)";`
`46`	`46`
`47`		`- return await _dapperHelper.Query<ActivityLogEntry>(sql, dbPara, CommandType.Text);`
	`47`	`+ return await _dapperHelper.GetAll<ActivityLogEntry>(sql, dbPara, CommandType.Text);`
`48`	`48`	`}`
`49`	`49`	`}`