Refactoring

apps/api/src/app/portfolio/portfolio.service.ts

@@ -847,7 +847,8 @@ export class PortfolioService {
         quantity,
         tags,
         timeWeightedInvestment,
-        timeWeightedInvestmentWithCurrencyEffect
+        timeWeightedInvestmentWithCurrencyEffect,
+        transactionCount
       } = holding;
 
       const activitiesOfHolding = activities.filter(({ SymbolProfile }) => {
@@ -966,7 +967,7 @@ export class PortfolioService {
         SymbolProfile,
         tags,
         activities: activitiesOfHolding,
-        activitiesCount: activitiesOfHolding.length,
+        activitiesCount: transactionCount,
         averagePrice: averagePrice.toNumber(),
         dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0],
         dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@@ -100,6 +100,7 @@ import { HoldingDetailDialogParams } from './interfaces/interfaces';
   templateUrl: 'holding-detail-dialog.html'
 })
 export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
+  public activitiesCount: number;
   public activityForm: FormGroup;
   public accounts: Account[];
   public assetClass: string;
@@ -151,8 +152,6 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
   public SymbolProfile: EnhancedSymbolProfile;
   public tags: Tag[];
   public tagsAvailable: Tag[];
-  public totalItems: number;
-  public transactionCount: number;
   public user: User;
   public value: number;
 
@@ -282,6 +281,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
           tags,
           value
         }) => {
+          this.activitiesCount = activitiesCount;
           this.averagePrice = averagePrice;
 
           if (
@@ -429,8 +429,6 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
 
           this.activityForm.setValue({ tags: this.tags }, { emitEvent: false });
 
-          this.transactionCount = activitiesCount;
-          this.totalItems = activitiesCount;
           this.value = value;
 
           if (SymbolProfile?.assetClass) {

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@@ -223,9 +223,9 @@
               <gf-value
                 size="medium"
                 [locale]="data.locale"
-                [value]="transactionCount"
+                [value]="activitiesCount"
               >
-                @if (transactionCount === 1) {
+                @if (activitiesCount === 1) {
                   <ng-container i18n>Activity</ng-container>
                 } @else {
                   <ng-container i18n>Activities</ng-container>
@@ -363,7 +363,7 @@
           [sortColumn]="sortColumn"
           [sortDirection]="sortDirection"
           [sortDisabled]="true"
-          [totalItems]="totalItems"
+          [totalItems]="activitiesCount"
           (activityToClone)="onCloneActivity($event)"
           (activityToUpdate)="onUpdateActivity($event)"
           (export)="onExport()"