activity history with immediate latest deployment information

client/src/app/pages/environment-deployment-history/environment-deployment-history.component.html

@@ -74,43 +74,60 @@
                     <i-tabler name="git-commit"></i-tabler>
                     {{ combinedHistory.sha?.slice(0, 7) }}
                   </li>
+                  <li class="flex align-items-center gap-2 mt-2">
+                    @if (combinedHistory.user?.avatarUrl) {
+                      <p-avatar
+                        class="w-6 h-6"
+                        shape="circle"
+                        size="normal"
+                        [image]="combinedHistory.user?.avatarUrl"
+                        [pTooltip]="keycloakService.isCurrentUser(combinedHistory.user?.login) ? 'You' : combinedHistory.user?.name"
+                        [styleClass]="getAvatarBorderClass(combinedHistory.user?.login || '')"
+                        (click)="openUserProfile(combinedHistory.user?.login || '')"
+                      >
+                      </p-avatar>
+                    } @else {
+                      <i-tabler name="user" class="w-6 h-6 text-gray-600" />
+                    }
+                    <span>{{ combinedHistory.user?.name }}</span>
+                  </li>
                 </ul>
               } @else if (combinedHistory.type === 'LOCK_EVENT') {
                 <div class="flex gap-1 items-center">
-                  @if (combinedHistory.lockedBy?.avatarUrl) {
+                  @if (combinedHistory.user?.avatarUrl) {
                     <p-avatar
                       class="w-6 h-6"
                       shape="circle"
                       size="normal"
-                      [image]="combinedHistory.lockedBy?.avatarUrl"
-                      [pTooltip]="keycloakService.isCurrentUser(combinedHistory.lockedBy?.login) ? 'You' : combinedHistory.lockedBy?.name"
-                      [styleClass]="getAvatarBorderClass(combinedHistory.lockedBy?.login || '')"
-                      (click)="openUserProfile(combinedHistory.lockedBy?.login || '')"
+                      [image]="combinedHistory.user?.avatarUrl"
+                      [pTooltip]="keycloakService.isCurrentUser(combinedHistory.user?.login) ? 'You' : combinedHistory.user?.name"
+                      [styleClass]="getAvatarBorderClass(combinedHistory.user?.login || '')"
+                      (click)="openUserProfile(combinedHistory.user?.login || '')"
                     >
                     </p-avatar>
                   } @else {
                     <i-tabler name="user" class="w-6 h-6 text-gray-600" />
                   }
                 </div>
-                <span>{{ combinedHistory.lockedBy?.name }}</span>
+                <span>{{ combinedHistory.user?.name }}</span>
               } @else if (combinedHistory.type === 'UNLOCK_EVENT') {
                 <div class="flex gap-1 items-center">
-                  @if (combinedHistory.lockedBy?.avatarUrl) {
+                  @if (combinedHistory.user?.avatarUrl) {
                     <p-avatar
                       class="w-6 h-6"
                       shape="circle"
                       size="normal"
-                      [image]="combinedHistory.lockedBy?.avatarUrl"
-                      [pTooltip]="keycloakService.isCurrentUser(combinedHistory.lockedBy?.login) ? 'You' : combinedHistory.lockedBy?.name"
-                      [styleClass]="getAvatarBorderClass(combinedHistory.lockedBy?.login || '')"
-                      (click)="openUserProfile(combinedHistory.lockedBy?.login || '')"
+                      [image]="combinedHistory.user?.avatarUrl"
+                      [pTooltip]="keycloakService.isCurrentUser(combinedHistory.user?.login) ? 'You' : combinedHistory.user?.name"
+                      [styleClass]="getAvatarBorderClass(combinedHistory.user?.login || '')"
+                      (click)="openUserProfile(combinedHistory.user?.login || '')"
                     >
                     </p-avatar>
                   } @else {
                     <i-tabler name="user" class="w-6 h-6 text-gray-600" />
                   }
                 </div>
-                <span>{{ combinedHistory.lockedBy?.name }}</span>
+                <span>{{ combinedHistory.user?.name }}</span>
               }
             </div>
           </td>

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/ActivityHistoryDto.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import de.tum.cit.aet.helios.environment.EnvironmentLockHistory;
 import de.tum.cit.aet.helios.gitrepo.RepositoryInfoDto;
-import de.tum.cit.aet.helios.user.User;
+import de.tum.cit.aet.helios.user.UserInfoDto;
 import java.time.OffsetDateTime;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -14,12 +14,32 @@ public record ActivityHistoryDto(
     Deployment.State state,
     String sha,
     String ref,
-    User lockedBy,
+    UserInfoDto user,
     OffsetDateTime timestamp,
     OffsetDateTime createdAt,
-    OffsetDateTime updatedAt
-) {
-
+    OffsetDateTime updatedAt) {
+
+  public static ActivityHistoryDto fromLatestDeploymentUnion(
+      String type, LatestDeploymentUnion union) {
+    // You could unify HeliosDeployment.Status -> Deployment.State, etc.
+    return new ActivityHistoryDto(
+        "DEPLOYMENT", // e.g. "LATEST_DEPLOYMENT"
+        union.getId(), // union returns the ID (Helios or real)
+        union.isNone()
+            ? null
+            : RepositoryInfoDto.fromRepository(
+                union.isRealDeployment()
+                    ? union.getRealDeployment().getRepository()
+                    : union.getHeliosDeployment().getEnvironment().getRepository()),
+        union.getState(), // mapped state
+        union.getSha(), // real or helios
+        union.getRef(), // branchName or real ref
+        UserInfoDto.fromUser(union.getCreator()),
+        union.getCreatedAt(), // we’ll consider “timestamp” = createdAt
+        union.getCreatedAt(),
+        union.getUpdatedAt());
+  }
+
   public static ActivityHistoryDto fromDeployment(Deployment deployment) {
     return new ActivityHistoryDto(
         "DEPLOYMENT",
@@ -28,7 +48,7 @@ public static ActivityHistoryDto fromDeployment(Deployment deployment) {
         deployment.getState(),
         deployment.getSha(),
         deployment.getRef(),
-        null,
+        UserInfoDto.fromUser(deployment.getCreator()),
         deployment.getCreatedAt(),
         deployment.getCreatedAt(),
         deployment.getUpdatedAt());
@@ -43,9 +63,9 @@ public static ActivityHistoryDto fromEnvironmentLockHistory(
         null,
         null,
         null,
-        environmentLockHistory.getLockedBy(),
-        "UNLOCK_EVENT".equals(type) 
-            ? environmentLockHistory.getUnlockedAt() 
+        UserInfoDto.fromUser(environmentLockHistory.getLockedBy()),
+        "UNLOCK_EVENT".equals(type)
+            ? environmentLockHistory.getUnlockedAt()
             : environmentLockHistory.getLockedAt(),
         null,
         null);

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/DeploymentService.java

@@ -5,6 +5,7 @@
 import de.tum.cit.aet.helios.environment.Environment;
 import de.tum.cit.aet.helios.environment.EnvironmentLockHistory;
 import de.tum.cit.aet.helios.environment.EnvironmentLockHistoryRepository;
+import de.tum.cit.aet.helios.environment.EnvironmentRepository;
 import de.tum.cit.aet.helios.environment.EnvironmentService;
 import de.tum.cit.aet.helios.github.GitHubService;
 import de.tum.cit.aet.helios.heliosdeployment.HeliosDeployment;
@@ -41,6 +42,7 @@ public class DeploymentService {
   private final PullRequestRepository pullRequestRepository;
   private final BranchService branchService;
   private final EnvironmentLockHistoryRepository lockHistoryRepository;
+  private final EnvironmentRepository environmentRepository;
 
   public DeploymentService(
       DeploymentRepository deploymentRepository,
@@ -51,7 +53,8 @@ public DeploymentService(
       HeliosDeploymentRepository heliosDeploymentRepository,
       PullRequestRepository pullRequestRepository,
       BranchService branchService,
-      EnvironmentLockHistoryRepository lockHistoryRepository) {
+      EnvironmentLockHistoryRepository lockHistoryRepository,
+      EnvironmentRepository environmentRepository) {
     this.deploymentRepository = deploymentRepository;
     this.gitHubService = gitHubService;
     this.environmentService = environmentService;
@@ -61,6 +64,7 @@ public DeploymentService(
     this.pullRequestRepository = pullRequestRepository;
     this.branchService = branchService;
     this.lockHistoryRepository = lockHistoryRepository;
+    this.environmentRepository = environmentRepository;
   }
 
   public Optional<DeploymentDto> getDeploymentById(Long id) {
@@ -214,26 +218,21 @@ private boolean canRedeploy(Environment environment, long timeoutMinutes) {
   }
 
   public List<ActivityHistoryDto> getActivityHistoryByEnvironmentId(Long environmentId) {
-    // 1) Fetch deployments and map
+    // 1) Real deployments
     List<Deployment> deployments =
         deploymentRepository.findByEnvironmentIdOrderByCreatedAtDesc(environmentId);
-
     List<ActivityHistoryDto> deploymentDtos =
         deployments.stream().map(ActivityHistoryDto::fromDeployment).toList();
 
-    // 2) Fetch lock history and map to one or two items per entry
+    // 3) Lock history (lock/unlock)
     List<EnvironmentLockHistory> lockHistories =
         lockHistoryRepository.findLockHistoriesByEnvironment(environmentId);
-
     List<ActivityHistoryDto> lockDtos =
         lockHistories.stream()
             .flatMap(
                 lock -> {
-                  // LOCK_EVENT
                   ActivityHistoryDto lockEvent =
                       ActivityHistoryDto.fromEnvironmentLockHistory("LOCK_EVENT", lock);
-
-                  // If unlockedAt is present, also create UNLOCK_EVENT
                   if (lock.getUnlockedAt() != null) {
                     ActivityHistoryDto unlockEvent =
                         ActivityHistoryDto.fromEnvironmentLockHistory("UNLOCK_EVENT", lock);
@@ -244,26 +243,35 @@ public List<ActivityHistoryDto> getActivityHistoryByEnvironmentId(Long environme
                 })
             .toList();
 
-    // 3) Combine everything
+    // 4) Combine the lists
     List<ActivityHistoryDto> combined = new ArrayList<>();
     combined.addAll(deploymentDtos);
+    // combined.addAll(heliosDtos);
     combined.addAll(lockDtos);
 
-    // 4) Sort by 'timestamp' descending
+    // 4a) Add heliosDeployment if it's the latest
+    var environment = environmentRepository.findById(environmentId).orElse(null);
+    if (environment != null) {
+      LatestDeploymentUnion latestUnion = environmentService.findLatestDeployment(environment);
+      if (!latestUnion.isNone() && latestUnion.isHeliosDeployment()) {
+        if (deploymentDtos.isEmpty()
+            || latestUnion.getUpdatedAt().isAfter(deploymentDtos.get(0).updatedAt())) {
+          ActivityHistoryDto latestItem =
+              ActivityHistoryDto.fromLatestDeploymentUnion("DEPLOYMENT", latestUnion);
+          combined.add(latestItem);
+        }
+      }
+    }
+
+    // 5) Sort by timestamp descending
     combined.sort(
         (a, b) -> {
           OffsetDateTime timeA = a.timestamp();
           OffsetDateTime timeB = b.timestamp();
-          if (timeA == null && timeB == null) {
-            return 0;
-          }
-          if (timeA == null) {
-            return 1; // place null timestamps last
-          }
-          if (timeB == null) {
-            return -1;
-          }
-          return timeB.compareTo(timeA); // descending
+          if (timeA == null && timeB == null) return 0;
+          if (timeA == null) return 1;
+          if (timeB == null) return -1;
+          return timeB.compareTo(timeA);
         });
 
     return combined;

server/application-server/src/main/java/de/tum/cit/aet/helios/environment/EnvironmentService.java

@@ -88,7 +88,7 @@ private Optional<Deployment> findDeploymentById(Environment environment, Long de
    * <p>Returns a small wrapper object with either a real Deployment or a HeliosDeployment. This
    * helps unify your "latest" logic into one place.
    */
-  private LatestDeploymentUnion findLatestDeployment(Environment env) {
+  public LatestDeploymentUnion findLatestDeployment(Environment env) {
     // (A) Check if we have a HeliosDeployment
     var maybeHelios = heliosDeploymentRepository.findTopByEnvironmentOrderByCreatedAtDesc(env);
     if (maybeHelios.isPresent()) {