Update FormatedName functionality now just truncates and adds OverflowChar + fixing getter Split, Stage, Contest

Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp

@@ -36,30 +36,30 @@ FString FDTFluxPerson::GetNormalizedString() const
 bool FDTFluxPerson::IsValid() const
 {
 	return !FirstName.TrimStartAndEnd().IsEmpty() &&
-	       !LastName.TrimStartAndEnd().IsEmpty() && 
+		!LastName.TrimStartAndEnd().IsEmpty() &&
-	       !Gender.TrimStartAndEnd().IsEmpty();
+		!Gender.TrimStartAndEnd().IsEmpty();
 }
 
 FDTFluxParticipant::FDTFluxParticipant()
 	: Bib(-1)
-	, ContestId(-1)
+	  , ContestId(-1)
-	, Elite(false)
+	  , Elite(false)
-	, Status(static_cast<EDTFluxParticipantStatusType>(0))
+	  , Status(static_cast<EDTFluxParticipantStatusType>(0))
-	, bIsMassStartParticipant(false)
+	  , bIsMassStartParticipant(false)
-	, CurrentSplit(-1)
+	  , CurrentSplit(-1)
 {
 	Teammate.Reset();
 }
 
 FDTFluxParticipant::FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject)
 	: Bib(JsonObject->GetIntegerField(TEXT("bib")))
-	, ContestId(JsonObject->GetIntegerField(TEXT("contestId")))
+	  , ContestId(JsonObject->GetIntegerField(TEXT("contestId")))
-	, Category(JsonObject->GetStringField(TEXT("category")))
+	  , Category(JsonObject->GetStringField(TEXT("category")))
-	, Club(JsonObject->GetStringField(TEXT("club")))
+	  , Club(JsonObject->GetStringField(TEXT("club")))
-	, Elite(JsonObject->GetBoolField(TEXT("elite")))
+	  , Elite(JsonObject->GetBoolField(TEXT("elite")))
-	, Status(static_cast<EDTFluxParticipantStatusType>(JsonObject->GetIntegerField(TEXT("status"))))
+	  , Status(static_cast<EDTFluxParticipantStatusType>(JsonObject->GetIntegerField(TEXT("status"))))
-	, Team(JsonObject->GetStringField(TEXT("team")))
+	  , Team(JsonObject->GetStringField(TEXT("team")))
-	, CurrentSplit(-1)
+	  , CurrentSplit(-1)
 {
 	UE_LOG(logDTFluxCore, Log, TEXT("Creating participant from JSON - Bib: %d, Contest: %d"), Bib, ContestId);
 
@@ -70,7 +70,8 @@ FDTFluxParticipant::FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject
 		FString GenderKey = Index == 1 ? TEXT("gender") : FString::Printf(TEXT("gender%d"), Index);
 
 		// Vérifie si au moins un des champs existe
-		if (!JsonObject->HasField(FirstNameKey) && !JsonObject->HasField(LastNameKey) && !JsonObject->HasField(GenderKey))
+		if (!JsonObject->HasField(FirstNameKey) && !JsonObject->HasField(LastNameKey) && !JsonObject->
+			HasField(GenderKey))
 		{
 			break;
 		}
@@ -157,16 +158,15 @@ const TArray<FDTFluxPerson>& FDTFluxParticipant::GetTeammate() const
 	return Teammate;
 }
 
-FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString& Separator, const FString& OverflowChar) const
+FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString& Separator,
+                                             const FString& OverflowChar) const
 {
 	if (MaxChar <= 0)
 	{
 		return TEXT("");
 	}
-
 	FString FirstName;
 	FString LastName;
-	
 	if (IsTeam())
 	{
 		if (!Team.IsEmpty())
@@ -197,46 +197,17 @@ FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString& S
 	{
 		Initial = FirstName.Left(1).ToUpper() + Separator;
 	}
-
 	FString FormattedLastName = LastName.ToUpper();
 	FString FullName = Initial + FormattedLastName;
-
 	if (FullName.Len() <= MaxChar)
 	{
 		return FullName;
 	}
-
+	return FullName.Left(MaxChar) + OverflowChar;
-	const int32 OverflowLength = OverflowChar.Len();
-
-	if (OverflowLength > MaxChar)
-	{
-		return FullName.Left(MaxChar);
-	}
-
-	if (Initial.Len() + OverflowLength > MaxChar)
-	{
-		return FullName.Left(MaxChar);
-	}
-
-	const int32 AvailableForLastName = MaxChar - Initial.Len() - OverflowLength;
-
-	if (AvailableForLastName <= 0)
-	{
-		return FullName.Left(MaxChar);
-	}
-
-	FString TruncatedName = Initial + FormattedLastName.Left(AvailableForLastName) + OverflowChar;
-
-	if (TruncatedName.Len() > MaxChar)
-	{
-		return TruncatedName.Left(MaxChar);
-	}
-
-	return TruncatedName;
 }
 
 FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FString& Separator,
-                                                  const FString& OverflowChar, const FString& BibSeparator) const
+                                                   const FString& OverflowChar, const FString& BibSeparator) const
 {
 	FString BibText = FString::FromInt(Bib) + BibSeparator;
 	int32 RemainingChars = MaxChar - BibText.Len();
@@ -250,39 +221,40 @@ FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FStr
 	return BibText + FormattedName;
 }
 
-FText FDTFluxParticipant::GetFormattedNameText(const int MaxChar, const FString& Separator, const FString& OverflowChar) const
+FText FDTFluxParticipant::GetFormattedNameText(const int MaxChar, const FString& Separator,
+                                               const FString& OverflowChar) const
 {
 	return FText::FromString(GetFormattedName(MaxChar, Separator, OverflowChar));
 }
 
 FText FDTFluxParticipant::GetConcatFormattedNameText(const int MaxChar, const FString& Separator,
-                                                    const FString& OverflowChar, const FString& BibSeparator) const
+                                                     const FString& OverflowChar, const FString& BibSeparator) const
 {
 	return FText::FromString(GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator));
 }
 
 FString FDTFluxParticipant::GetFormattedName(const FDTFluxParticipant& Participant, const int MaxChar,
-                                            const FString& Separator, const FString& OverflowChar)
+                                             const FString& Separator, const FString& OverflowChar)
 {
 	return Participant.GetFormattedName(MaxChar, Separator, OverflowChar);
 }
 
 FString FDTFluxParticipant::GetConcatFormattedName(const FDTFluxParticipant& Participant, const int MaxChar,
-                                                  const FString& Separator, const FString& OverflowChar,
+                                                   const FString& Separator, const FString& OverflowChar,
-                                                  const FString& BibSeparator)
+                                                   const FString& BibSeparator)
 {
 	return Participant.GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator);
 }
 
 FText FDTFluxParticipant::GetFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar,
-                                              const FString& Separator, const FString& OverflowChar)
+                                               const FString& Separator, const FString& OverflowChar)
 {
 	return Participant.GetFormattedNameText(MaxChar, Separator, OverflowChar);
 }
 
 FText FDTFluxParticipant::GetConcatFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar,
-                                                    const FString& Separator, const FString& OverflowChar,
+                                                     const FString& Separator, const FString& OverflowChar,
-                                                    const FString& BibSeparator)
+                                                     const FString& BibSeparator)
 {
 	return Participant.GetConcatFormattedNameText(MaxChar, Separator, OverflowChar, BibSeparator);
 }
@@ -300,6 +272,6 @@ FDTFluxParticipant FDTFluxParticipant::CreateFromJson(const TSharedPtr<FJsonObje
 
 FDTFluxTeamStatusUpdate::FDTFluxTeamStatusUpdate(const int InBib, const int InStatus)
 	: Bib(InBib)
-	, Status(static_cast<EDTFluxParticipantStatusType>(InStatus))
+	  , Status(static_cast<EDTFluxParticipantStatusType>(InStatus))
 {
 }

Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp

@@ -7,6 +7,7 @@
 
 #include "DTFluxCoreSubsystem.h"
 #include "DTFluxCoreSubsystemModule.h"
+#include "Dataflow/DataflowContextCache.h"
 
 UDTFluxPursuitManager::UDTFluxPursuitManager(const FObjectInitializer& ObjectInitializer):
 	Super(ObjectInitializer)
@@ -69,11 +70,14 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
                                        TArray<FDTFluxPursuitInfo>& OutPursuitNext, bool& BIsFocusTruncate,
                                        const int MaxSimultaneousPursuit)
 {
-	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("=== GetPursuit CALLED ==="));
+	FDateTime MetricsStartFunction = FDateTime::UtcNow();
-	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("MaxSimultaneousPursuit: %d"), MaxSimultaneousPursuit);
+	FDateTime CurrentTime = FDateTime::Now();
-	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Available groups: %d"), GroupedPursuit.Num());
 
-	// Validation
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("=== GetPursuit CALLED ==="));
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("MaxSimultaneousPursuit: %d"), MaxSimultaneousPursuit);
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Available groups: %d"), GroupedPursuit.Num());
+
+	// BAd Parameter
 	if (MaxSimultaneousPursuit <= 0)
 	{
 		UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Invalid MaxSimultaneousPursuit: %d"), MaxSimultaneousPursuit);
@@ -82,7 +86,6 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
 		BIsFocusTruncate = false;
 		return;
 	}
-
 	if (bIsSequenceDone || GroupedPursuit.IsEmpty())
 	{
 		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("No groups available or sequence completed"));
@@ -91,13 +94,41 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
 		BIsFocusTruncate = false;
 		return;
 	}
+	for (int32 i = GroupedPursuit.Num() - 1; i >= 0; i--) // Parcours inverse pour éviter les problèmes d'index
+	{
+		const FDTFluxPursuitGroup& Group = GroupedPursuit[i];
+		UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("Group.StartTimeGlobal(%s)  < CurrentTime(%s) "),
+		       *Group.StartTimeGlobal.ToString(), *CurrentTime.ToString())
+		// Vérifier si le StartTime du groupe est déjà passé
+		if (Group.StartTimeGlobal < CurrentTime)
+		{
+			UE_LOG(logDTFluxCoreSubsystem, Warning,
+			       TEXT("Removing expired group: StartTime=%s (Current=%s), Participants=%d"),
+			       *Group.StartTimeGlobal.ToString(),
+			       *CurrentTime.ToString(),
+			       Group.PursuitGroup.Num());
+
+			GroupedPursuit.RemoveAt(i);
+		}
+	}
+
 
 	OutPursuitFocusNext.Reset();
 	OutPursuitNext.Reset();
 
-	// === ÉTAPE 1: FOCUS = PREMIER GROUPE (et le supprimer) ===
+	// === VÉRIFICATION CRITIQUE : S'assurer qu'il reste des groupes après suppression ===
-	FDTFluxPursuitGroup FocusGroup = GroupedPursuit[0]; // Copie du premier groupe
+	if (GroupedPursuit.IsEmpty())
-	GroupedPursuit.RemoveAt(0); // ✅ SUPPRIMER le premier groupe
+	{
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("All groups were expired and removed - no groups available"));
+		OutPursuitFocusNext.Reset();
+		OutPursuitNext.Reset();
+		BIsFocusTruncate = false;
+		bIsSequenceDone = true; // Marquer la séquence comme terminée
+		return;
+	}
+
+	FDTFluxPursuitGroup FocusGroup = GroupedPursuit[0];
+	GroupedPursuit.RemoveAt(0);
 
 	SetPursuitInfoIsMassStart(FocusGroup);
 	OutPursuitFocusNext = FocusGroup.PursuitGroup;
@@ -114,7 +145,6 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
 
 	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Target Next Count: %d"), TargetNextCount);
 
-	// ✅ PARCOURIR les groupes restants SANS les modifier
 	for (int32 GroupIndex = 0;
 	     GroupIndex < GroupedPursuit.Num() && AddedNextCount < TargetNextCount;
 	     GroupIndex++)
@@ -136,7 +166,6 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
 		       AvailableInGroup,
 		       NeededFromGroup);
 
-		// ✅ COPIER les participants nécessaires (SANS les supprimer du groupe)
 		for (int32 ParticipantIndex = 0; ParticipantIndex < NeededFromGroup; ParticipantIndex++)
 		{
 			FDTFluxPursuitInfo NextParticipant = NextGroup.PursuitGroup[ParticipantIndex]; // Copie
@@ -176,6 +205,10 @@ void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFoc
 		bIsSequenceDone = true;
 		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Pursuit sequence will be completed after this round"));
 	}
+	FTimespan Duration = FDateTime::UtcNow() - MetricsStartFunction;
+
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Metrics Time Out: %d fraction seconds"),
+	       Duration.GetDuration().GetFractionMicro());
 }
 
 bool UDTFluxPursuitManager::InitSubSystems()

Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "DTFluxCoreSubsystemModule.h"
+#include "Assets/DTFluxModelAsset.h"
 #include "Containers/Deque.h"
 #include "Types/Struct/FDTFluxPursuitInfo.h"
 #include "Subsystems/EngineSubsystem.h"
@@ -98,9 +100,9 @@ public:
 	TArray<FDTFluxContest> GetCurrentContests();
 	UFUNCTION()
 	TArray<int> GetContestsIdForTime(const FDateTime Time) const;
-	UFUNCTION()
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
 	bool GetContestForId(const int Id, FDTFluxContest& OutContest);
-	UFUNCTION()
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
 	TArray<FDTFluxContest> GetContestsForTime(const FDateTime Time);
 
 	UFUNCTION()
@@ -108,6 +110,85 @@ public:
 	UFUNCTION()
 	TArray<FDTFluxContest> GetContests();
 
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetContest(const int ContestId, FDTFluxContest& OutContest)
+	{
+		OutContest = FDTFluxContest();
+		if (GetContestForId(ContestId, OutContest))
+		{
+			return;
+		}
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d not found in ContestDefinition"), ContestId)
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	bool GetStageDefinition(const FDTFluxStageKey StageKey, FDTFluxStage& OutStageDefinition)
+	{
+		int ContestId = StageKey.ContestId;
+		int StageId = StageKey.StageId;
+		FDTFluxContest ContestDefinition;
+		if (GetContestForId(ContestId, ContestDefinition))
+		{
+			for (auto& Stage : ContestDefinition.Stages)
+			{
+				if (Stage.StageId == StageId)
+				{
+					OutStageDefinition = Stage;
+					return true;
+				}
+			}
+		}
+		OutStageDefinition = FDTFluxStage();
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d, StageId %d not found in ContestDefinition"),
+		       ContestId, StageId)
+		return false;
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	bool GetSplitDefinition(const FDTFluxSplitKey SplitKey, FDTFluxSplit& OutSplitDefinition)
+	{
+		int ContestId = SplitKey.ContestId;
+		int SplitId = SplitKey.SplitId;
+		FDTFluxContest ContestDefinition;
+		if (GetContestForId(ContestId, ContestDefinition))
+		{
+			for (auto& Split : ContestDefinition.Splits)
+			{
+				if (Split.SplitId == SplitId)
+				{
+					OutSplitDefinition = Split;
+					return true;
+				}
+			}
+		}
+		OutSplitDefinition = FDTFluxSplit();
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d, SplitId %d not found in ContestDefinition"),
+		       ContestId, SplitId);
+		return false;
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetStage(const int ContestId, const int StageId, FDTFluxStage& OutStageDefinition)
+	{
+		if (GetStageDefinition(FDTFluxStageKey(ContestId, StageId),
+		                       OutStageDefinition))
+		{
+			return;
+		}
+		OutStageDefinition = FDTFluxStage();
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetSplit(const int ContestId, const int StageId, const int SplitId, FDTFluxSplit& OutSplitDefinition)
+	{
+		if (GetSplitDefinition(FDTFluxSplitKey(ContestId, StageId, SplitId),
+		                       OutSplitDefinition))
+		{
+			return;
+		}
+		OutSplitDefinition = FDTFluxSplit();
+	}
+
 protected:
 	// ~Subsystem Interface
 	virtual void Initialize(FSubsystemCollectionBase& Collection) override;

Source/DTFluxUtilities/Private/DTFluxDatesUtilities.cpp

@@ -1,6 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-
 #include "DTFluxDatesUtilities.h"
 
 #include "DTFluxUtilitiesModule.h"
@@ -16,18 +15,20 @@ DTFluxDatesUtilities::~DTFluxDatesUtilities()
 
 bool DTFluxDatesUtilities::CompileDateAndTime(const FString& Time, const FString& Date, FDateTime& OutDateTime)
 {
-	if(Time.Len() < 8 && Date.Len() < 10)
+	if (Time.Len() < 8 && Date.Len() < 10)
 	{
 		TArray<FString> ExplodedTime;
 		Time.ParseIntoArray(ExplodedTime, TEXT(":"));
-		if(ExplodedTime.Num() != 3 && !ExplodedTime[0].IsNumeric() && !ExplodedTime[1].IsNumeric() & !ExplodedTime[2].IsNumeric())
+		if (ExplodedTime.Num() != 3 && !ExplodedTime[0].IsNumeric() && !ExplodedTime[1].IsNumeric() & !ExplodedTime[2].
+			IsNumeric())
 		{
 			UE_LOG(logDTFluxUtilities, Error, TEXT("Bad Time Format [%s]. Unable to parse"), *Time);
 			return false;
 		}
 		TArray<FString> ExplodedDate;
 		Date.ParseIntoArray(ExplodedDate, TEXT("-"));
-		if(ExplodedDate.Num() != 3 && !ExplodedDate[0].IsNumeric() && !ExplodedDate[1].IsNumeric() && !ExplodedDate[2].IsNumeric() )
+		if (ExplodedDate.Num() != 3 && !ExplodedDate[0].IsNumeric() && !ExplodedDate[1].IsNumeric() && !ExplodedDate[2].
+			IsNumeric())
 		{
 			UE_LOG(logDTFluxUtilities, Error, TEXT("Bad Date Format [%s]. Unable to parse"), *Date);
 			return false;
@@ -38,7 +39,7 @@ bool DTFluxDatesUtilities::CompileDateAndTime(const FString& Time, const FString
 		int32 Day = FCString::Atoi(*ExplodedDate[2]);
 		int32 Month = FCString::Atoi(*ExplodedDate[1]);
 		int32 Year = FCString::Atoi(*ExplodedDate[0]);
-		if(FDateTime::Validate(Year, Month, Day, Hours, Minutes, Seconds, 0))
+		if (FDateTime::Validate(Year, Month, Day, Hours, Minutes, Seconds, 0))
 		{
 			OutDateTime = FDateTime(Year, Month, Day, Hours, Minutes, Seconds);
 			return true;

Source/DTFluxUtilities/Public/DTFluxDatesUtilities.h

@@ -1,11 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
-
 #pragma once
 
 #include "CoreMinimal.h"
-/**
+
- * 
- */
 class DTFLUXUTILITIES_API DTFluxDatesUtilities
 {
 public: