Merge branch 'main' into es-translations

CHANGELOG.md

@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the content of the _General_ section by the performance calculation method on the Frequently Asked Questions (FAQ) page
+
 ### Changed
 
-- Improved the language localization for Spanish (`es`)
+- Renamed `orders` to `activities` in the `Tag` database schema
 - Improved the language localization for Dutch (`nl`)
+- Improved the language localization for Spanish (`es`)
+- Upgraded `big.js` from version `6.2.2` to `7.0.1`
 
 ## 2.164.0 - 2025-05-28
 

apps/api/src/services/tag/tag.service.ts

@@ -52,7 +52,7 @@ export class TagService {
       include: {
         _count: {
           select: {
-            orders: {
+            activities: {
               where: {
                 userId
               }
@@ -79,7 +79,7 @@ export class TagService {
       id,
       name,
       userId,
-      isUsed: _count.orders > 0
+      isUsed: _count.activities > 0
     }));
   }
 
@@ -87,7 +87,7 @@ export class TagService {
     const tagsWithOrderCount = await this.prismaService.tag.findMany({
       include: {
         _count: {
-          select: { orders: true }
+          select: { activities: true }
         }
       }
     });
@@ -97,7 +97,7 @@ export class TagService {
         id,
         name,
         userId,
-        activityCount: _count.orders
+        activityCount: _count.activities
       };
     });
   }

apps/client/src/app/pages/faq/overview/faq-overview-page.html

@@ -40,6 +40,21 @@
           <a [routerLink]="routerLinkFeatures">here</a>.
         </mat-card-content>
       </mat-card>
+      <mat-card appearance="outlined" class="mb-3">
+        <mat-card-header>
+          <mat-card-title
+            >Which calculation method does Ghostfolio use for
+            performance?</mat-card-title
+          >
+        </mat-card-header>
+        <mat-card-content
+          >Ghostfolio uses the <i>Return on Average Investment</i> (ROAI)
+          calculation method based on the average amount of capital invested
+          over time. ROAI aims to provide a more insightful view of investment
+          performance than simpler approaches, especially when contributions are
+          made over time.</mat-card-content
+        >
+      </mat-card>
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-header>
           <mat-card-title>Can I use Ghostfolio anonymously?</mat-card-title>

package-lock.json

@@ -47,7 +47,7 @@
         "@simplewebauthn/server": "13.1.1",
         "@stripe/stripe-js": "5.4.0",
         "alphavantage": "2.2.0",
-        "big.js": "6.2.2",
+        "big.js": "7.0.1",
         "bootstrap": "4.6.2",
         "bull": "4.16.5",
         "chart.js": "4.4.9",
@@ -15220,9 +15220,9 @@
       }
     },
     "node_modules/big.js": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.2.tgz",
-      "integrity": "sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-7.0.1.tgz",
+      "integrity": "sha512-iFgV784tD8kq4ccF1xtNMZnXeZzVuXWWM+ERFzKQjv+A5G9HC8CY3DuV45vgzFFcW+u2tIvmF95+AzWgs6BjCg==",
       "license": "MIT",
       "engines": {
         "node": "*"

package.json

@@ -93,7 +93,7 @@
     "@simplewebauthn/server": "13.1.1",
     "@stripe/stripe-js": "5.4.0",
     "alphavantage": "2.2.0",
-    "big.js": "6.2.2",
+    "big.js": "7.0.1",
     "bootstrap": "4.6.2",
     "bull": "4.16.5",
     "chart.js": "4.4.9",

prisma/schema.prisma

@@ -233,11 +233,11 @@ model Subscription {
 }
 
 model Tag {
-  id     String  @id @default(uuid())
-  name   String
-  orders Order[]
-  userId String?
-  User   User?   @relation(fields: [userId], onDelete: Cascade, references: [id])
+  activities Order[]
+  id         String  @id @default(uuid())
+  name       String
+  userId     String?
+  User       User?   @relation(fields: [userId], onDelete: Cascade, references: [id])
 
   @@unique([name, userId])
   @@index([name])