Deprecate ITEM activity type in favor of BUY

2 months ago · 7608714aa4
30 changed files with 85 additions and 119 deletions
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@ -564,6 +564,12 @@ export class ImportService {
      index,
      { currency, dataSource, symbol, type }
    ] of activitiesDto.entries()) {
+      if (type === 'ITEM') {
+        throw new Error(
+          `activities.${index}.type ("${type}") is deprecated, please use "BUY" instead`
+        );
+      }
+
      if (!dataSources.includes(dataSource)) {
        throw new Error(
          `activities.${index}.dataSource ("${dataSource}") is not valid`
@ -595,7 +601,11 @@ export class ImportService {
          )?.[symbol]
        };

-        if (type === 'BUY' || type === 'DIVIDEND' || type === 'SELL') {
+        if (
+          (dataSource !== 'MANUAL' && type === 'BUY') ||
+          type === 'DIVIDEND' ||
+          type === 'SELL'
+        ) {
          if (!assetProfile?.name) {
            throw new Error(
              `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -189,6 +189,7 @@ export class OrderController {
  public async createOrder(@Body() data: CreateOrderDto): Promise<OrderModel> {
    const currency = data.currency;
    const customCurrency = data.customCurrency;
+    const dataSource = data.dataSource;

    if (customCurrency) {
      data.currency = customCurrency;
@ -196,6 +197,8 @@ export class OrderController {
      delete data.customCurrency;
    }

+    delete data.dataSource;
+
    const order = await this.orderService.createOrder({
      ...data,
      date: parseISO(data.date),
@ -203,12 +206,12 @@ export class OrderController {
        connectOrCreate: {
          create: {
            currency,
-            dataSource: data.dataSource,
+            dataSource,
            symbol: data.symbol
          },
          where: {
            dataSource_symbol: {
-              dataSource: data.dataSource,
+              dataSource,
              symbol: data.symbol
            }
          }
@ -218,13 +221,13 @@ export class OrderController {
      userId: this.request.user.id
    });

-    if (data.dataSource && !order.isDraft) {
+    if (dataSource && !order.isDraft) {
      // Gather symbol data in the background, if data source is set
      // (not MANUAL) and not draft
      this.dataGatheringService.gatherSymbols({
        dataGatheringItems: [
          {
-            dataSource: data.dataSource,
+            dataSource,
            date: order.date,
            symbol: data.symbol
          }
@ -256,6 +259,7 @@ export class OrderController {

    const accountId = data.accountId;
    const customCurrency = data.customCurrency;
+    const dataSource = data.dataSource;

    delete data.accountId;

@ -265,6 +269,8 @@ export class OrderController {
      delete data.customCurrency;
    }

+    delete data.dataSource;
+
    return this.orderService.updateOrder({
      data: {
        ...data,
@ -277,7 +283,7 @@ export class OrderController {
        SymbolProfile: {
          connect: {
            dataSource_symbol: {
-              dataSource: data.dataSource,
+              dataSource,
              symbol: data.symbol
            }
          },
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -93,7 +93,6 @@ export class OrderService {
      assetClass?: AssetClass;
      assetSubClass?: AssetSubClass;
      currency?: string;
-      dataSource?: DataSource;
      symbol?: string;
      tags?: Tag[];
      updateAccountBalance?: boolean;
@ -118,7 +117,11 @@ export class OrderService {
    const updateAccountBalance = data.updateAccountBalance ?? false;
    const userId = data.userId;

-    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type)) {
+    if (
+      ['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type) ||
+      (data.SymbolProfile.connectOrCreate.create.dataSource === 'MANUAL' &&
+        data.type === 'BUY')
+    ) {
      const assetClass = data.assetClass;
      const assetSubClass = data.assetSubClass;
      const dataSource: DataSource = 'MANUAL';
@ -164,7 +167,6 @@ export class OrderService {
      delete data.comment;
    }

-    delete data.dataSource;
    delete data.symbol;
    delete data.tags;
    delete data.updateAccountBalance;
@ -631,7 +633,6 @@ export class OrderService {
      assetClass?: AssetClass;
      assetSubClass?: AssetSubClass;
      currency?: string;
-      dataSource?: DataSource;
      symbol?: string;
      tags?: Tag[];
      type?: ActivityType;
@ -675,7 +676,6 @@ export class OrderService {

    delete data.assetClass;
    delete data.assetSubClass;
-    delete data.dataSource;
    delete data.symbol;
    delete data.tags;

--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@ -187,8 +187,7 @@ export abstract class PortfolioCalculator {
        totalInterestWithCurrencyEffect: new Big(0),
        totalInvestment: new Big(0),
        totalInvestmentWithCurrencyEffect: new Big(0),
-        totalLiabilitiesWithCurrencyEffect: new Big(0),
-        totalValuablesWithCurrencyEffect: new Big(0)
+        totalLiabilitiesWithCurrencyEffect: new Big(0)
      };
    }

@ -198,7 +197,6 @@ export abstract class PortfolioCalculator {
    let firstTransactionPoint: TransactionPoint = null;
    let totalInterestWithCurrencyEffect = new Big(0);
    let totalLiabilitiesWithCurrencyEffect = new Big(0);
-    let totalValuablesWithCurrencyEffect = new Big(0);

    for (const { currency, dataSource, symbol } of transactionPoints[
      firstIndex - 1
@ -364,8 +362,7 @@ export abstract class PortfolioCalculator {
        totalInterestInBaseCurrency,
        totalInvestment,
        totalInvestmentWithCurrencyEffect,
-        totalLiabilitiesInBaseCurrency,
-        totalValuablesInBaseCurrency
+        totalLiabilitiesInBaseCurrency
      } = this.getSymbolMetrics({
        chartDateMap,
        marketSymbolMap,
@ -444,10 +441,6 @@ export abstract class PortfolioCalculator {
      totalLiabilitiesWithCurrencyEffect =
        totalLiabilitiesWithCurrencyEffect.plus(totalLiabilitiesInBaseCurrency);

-      totalValuablesWithCurrencyEffect = totalValuablesWithCurrencyEffect.plus(
-        totalValuablesInBaseCurrency
-      );
-
      if (
        (hasErrors ||
          currentRateErrors.find(({ dataSource, symbol }) => {
@ -597,7 +590,6 @@ export abstract class PortfolioCalculator {
        netPerformance: totalNetPerformanceValue.toNumber(),
        netPerformanceWithCurrencyEffect:
          totalNetPerformanceValueWithCurrencyEffect.toNumber(),
-        // TODO: Add valuables
        netWorth: totalCurrentValueWithCurrencyEffect
          .plus(totalAccountBalanceWithCurrencyEffect)
          .toNumber(),
@ -619,7 +611,6 @@ export abstract class PortfolioCalculator {
      positions,
      totalInterestWithCurrencyEffect,
      totalLiabilitiesWithCurrencyEffect,
-      totalValuablesWithCurrencyEffect,
      hasErrors: hasAnySymbolMetricsErrors || overall.hasErrors
    };
  }
@ -754,7 +745,7 @@ export abstract class PortfolioCalculator {
              ? 0
              : netPerformanceWithCurrencyEffectSinceStartDate /
                timeWeightedInvestmentValue
-          // TODO: Add net worth with valuables
+          // TODO: Add net worth
          // netWorth: totalCurrentValueWithCurrencyEffect
          //   .plus(totalAccountBalanceWithCurrencyEffect)
          //   .toNumber()
@ -819,12 +810,6 @@ export abstract class PortfolioCalculator {
    return this.transactionPoints;
  }

-  public async getValuablesInBaseCurrency() {
-    await this.snapshotPromise;
-
-    return this.snapshot.totalValuablesWithCurrencyEffect;
-  }
-
  private getChartDateMap({
    endDate,
    startDate,
@ -1000,19 +985,12 @@ export abstract class PortfolioCalculator {
        liabilities = quantity.mul(unitPrice);
      }

-      let valuables = new Big(0);
-
-      if (type === 'ITEM') {
-        valuables = quantity.mul(unitPrice);
-      }
-
      if (lastDate !== date || lastTransactionPoint === null) {
        lastTransactionPoint = {
          date,
          fees,
          interest,
          liabilities,
-          valuables,
          items: newItems
        };

@ -1024,8 +1002,6 @@ export abstract class PortfolioCalculator {
        lastTransactionPoint.items = newItems;
        lastTransactionPoint.liabilities =
          lastTransactionPoint.liabilities.plus(liabilities);
-        lastTransactionPoint.valuables =
-          lastTransactionPoint.valuables.plus(valuables);
      }

      lastDate = date;
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
@ -194,8 +194,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
        totalInvestmentWithCurrencyEffect: new Big('0'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts
@ -179,8 +179,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
        totalInvestmentWithCurrencyEffect: new Big('0'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts
@ -170,8 +170,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('273.2'),
        totalInvestmentWithCurrencyEffect: new Big('273.2'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
@ -224,8 +224,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('44558.42'),
        totalInvestmentWithCurrencyEffect: new Big('44558.42'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@ -198,8 +198,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('320.43').mul(0.97373),
        totalInvestmentWithCurrencyEffect: new Big('318.542667299999967957'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
@ -224,8 +224,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('44558.42'),
        totalInvestmentWithCurrencyEffect: new Big('44558.42'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts
@ -151,8 +151,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
        totalInvestmentWithCurrencyEffect: new Big('0'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts
@ -177,8 +177,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('89.12').mul(0.8854),
        totalInvestmentWithCurrencyEffect: new Big('82.329056'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-item.spec.ts
@ -151,8 +151,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
        totalInvestmentWithCurrencyEffect: new Big('0'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts
@ -170,8 +170,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('298.58'),
        totalInvestmentWithCurrencyEffect: new Big('298.58'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts
@ -105,8 +105,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big(0),
        totalInvestmentWithCurrencyEffect: new Big(0),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([]);
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@ -177,8 +177,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('75.80'),
        totalInvestmentWithCurrencyEffect: new Big('75.80'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
@ -228,8 +228,7 @@ describe('PortfolioCalculator', () => {
        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
        totalInvestmentWithCurrencyEffect: new Big('0'),
-        totalLiabilitiesWithCurrencyEffect: new Big('0'),
-        totalValuablesWithCurrencyEffect: new Big('0')
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
      });

      expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
@ -108,8 +108,7 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
      createdAt: new Date(),
      errors: [],
      historicalData: [],
-      totalLiabilitiesWithCurrencyEffect: new Big(0),
-      totalValuablesWithCurrencyEffect: new Big(0)
+      totalLiabilitiesWithCurrencyEffect: new Big(0)
    };
  }

@ -179,8 +178,6 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
    let totalLiabilitiesInBaseCurrency = new Big(0);
    let totalQuantityFromBuyTransactions = new Big(0);
    let totalUnits = new Big(0);
-    let totalValuables = new Big(0);
-    let totalValuablesInBaseCurrency = new Big(0);
    let valueAtStartDate: Big;
    let valueAtStartDateWithCurrencyEffect: Big;

@ -224,9 +221,7 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
        totalInvestment: new Big(0),
        totalInvestmentWithCurrencyEffect: new Big(0),
        totalLiabilities: new Big(0),
-        totalLiabilitiesInBaseCurrency: new Big(0),
-        totalValuables: new Big(0),
-        totalValuablesInBaseCurrency: new Big(0)
+        totalLiabilitiesInBaseCurrency: new Big(0)
      };
    }

@ -274,9 +269,7 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
        totalInvestment: new Big(0),
        totalInvestmentWithCurrencyEffect: new Big(0),
        totalLiabilities: new Big(0),
-        totalLiabilitiesInBaseCurrency: new Big(0),
-        totalValuables: new Big(0),
-        totalValuablesInBaseCurrency: new Big(0)
+        totalLiabilitiesInBaseCurrency: new Big(0)
      };
    }

@ -412,13 +405,6 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
        totalInterestInBaseCurrency = totalInterestInBaseCurrency.plus(
          interest.mul(exchangeRateAtOrderDate ?? 1)
        );
-      } else if (order.type === 'ITEM') {
-        const valuables = order.quantity.mul(order.unitPrice);
-
-        totalValuables = totalValuables.plus(valuables);
-        totalValuablesInBaseCurrency = totalValuablesInBaseCurrency.plus(
-          valuables.mul(exchangeRateAtOrderDate ?? 1)
-        );
      } else if (order.type === 'LIABILITY') {
        const liabilities = order.quantity.mul(order.unitPrice);

@ -971,8 +957,6 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
      totalInvestmentWithCurrencyEffect,
      totalLiabilities,
      totalLiabilitiesInBaseCurrency,
-      totalValuables,
-      totalValuablesInBaseCurrency,
      grossPerformance: totalGrossPerformance,
      grossPerformanceWithCurrencyEffect:
        totalGrossPerformanceWithCurrencyEffect,
--- a/apps/api/src/app/portfolio/interfaces/transaction-point.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/transaction-point.interface.ts
@ -8,5 +8,4 @@ export interface TransactionPoint {
  interest: Big;
  items: TransactionPointSymbol[];
  liabilities: Big;
-  valuables: Big;
 }
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -1825,8 +1825,6 @@ export class PortfolioService {
    const liabilities =
      await portfolioCalculator.getLiabilitiesInBaseCurrency();

-    const valuables = await portfolioCalculator.getValuablesInBaseCurrency();
-
    const totalBuy = this.getSumOfActivityType({
      userCurrency,
      activities: nonExcludedActivities,
@ -1875,7 +1873,6 @@ export class PortfolioService {

    const netWorth = new Big(balanceInBaseCurrency)
      .plus(currentValueInBaseCurrency)
-      .plus(valuables)
      .plus(excludedAccountsAndActivities)
      .minus(liabilities)
      .toNumber();
@ -1934,7 +1931,6 @@ export class PortfolioService {
        .plus(fees)
        .toNumber(),
      interest: interest.toNumber(),
-      items: valuables.toNumber(),
      liabilities: liabilities.toNumber(),
      totalInvestment: totalInvestment.toNumber(),
      totalValueInBaseCurrency: netWorth
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@ -152,18 +152,6 @@
      />
    </div>
  </div>
-  <div class="flex-nowrap px-3 py-1 row">
-    <div class="flex-grow-1 text-truncate" i18n>Valuables</div>
-    <div class="justify-content-end">
-      <gf-value
-        class="justify-content-end"
-        [isCurrency]="true"
-        [locale]="locale"
-        [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.items"
-      />
-    </div>
-  </div>
  <div class="flex-nowrap px-3 py-1 row">
    <div class="flex-grow-1 text-truncate" i18n>Emergency Fund</div>
    <div
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@ -194,9 +194,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
      )
      .subscribe(async () => {
        if (
-          this.activityForm.get('type').value === 'BUY' ||
-          this.activityForm.get('type').value === 'FEE' ||
-          this.activityForm.get('type').value === 'ITEM'
+          ['BUY', 'FEE', 'ITEM'].includes(this.activityForm.get('type').value)
        ) {
          this.total =
            this.activityForm.get('quantity').value *
@ -215,12 +213,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
    this.activityForm.get('accountId').valueChanges.subscribe((accountId) => {
      const type = this.activityForm.get('type').value;

-      if (
-        type === 'FEE' ||
-        type === 'INTEREST' ||
-        type === 'ITEM' ||
-        type === 'LIABILITY'
-      ) {
+      if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(type)) {
        const currency =
          this.data.accounts.find(({ id }) => {
            return id === accountId;
@ -472,6 +465,12 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
          object: activity
        });

+        if (activity.type === 'ITEM') {
+          // Transform deprecated type ITEM
+          activity.dataSource = 'MANUAL';
+          activity.type = 'BUY';
+        }
+
        this.dialogRef.close(activity);
      } else {
        (activity as UpdateOrderDto).id = this.data.activity?.id;
@ -483,6 +482,12 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
          object: activity as UpdateOrderDto
        });

+        if (activity.type === 'ITEM') {
+          // Transform deprecated type ITEM
+          activity.dataSource = 'MANUAL';
+          activity.type = 'BUY';
+        }
+
        this.dialogRef.close(activity as UpdateOrderDto);
      }
    } catch (error) {
--- a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts
+++ b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts
@ -20,7 +20,6 @@ export interface PortfolioSummary extends PortfolioPerformance {
  grossPerformance: number;
  grossPerformanceWithCurrencyEffect: number;
  interest: number;
-  items: number;
  liabilities: number;
  totalBuy: number;
  totalSell: number;
--- a/libs/common/src/lib/interfaces/symbol-metrics.interface.ts
+++ b/libs/common/src/lib/interfaces/symbol-metrics.interface.ts
@ -51,6 +51,4 @@ export interface SymbolMetrics {
  totalInvestmentWithCurrencyEffect: Big;
  totalLiabilities: Big;
  totalLiabilitiesInBaseCurrency: Big;
-  totalValuables: Big;
-  totalValuablesInBaseCurrency: Big;
 }
--- a/libs/common/src/lib/models/portfolio-snapshot.ts
+++ b/libs/common/src/lib/models/portfolio-snapshot.ts
@ -45,8 +45,4 @@ export class PortfolioSnapshot {
  @Transform(transformToBig, { toClassOnly: true })
  @Type(() => Big)
  totalLiabilitiesWithCurrencyEffect: Big;
-
-  @Transform(transformToBig, { toClassOnly: true })
-  @Type(() => Big)
-  totalValuablesWithCurrencyEffect: Big;
 }
--- a/prisma/migrations/20250704214021_changed_type_from_item_to_buy_in_order/migration.sql
+++ b/prisma/migrations/20250704214021_changed_type_from_item_to_buy_in_order/migration.sql
@ -0,0 +1,2 @@
+-- AlterTable
+UPDATE "Order" SET "type" = 'BUY' WHERE "type" = 'ITEM';
--- a/test/import/not-ok/invalid-type-deprecated.json
+++ b/test/import/not-ok/invalid-type-deprecated.json
@ -0,0 +1,20 @@
+{
+  "meta": {
+    "date": "2023-02-05T00:00:00.000Z",
+    "version": "dev"
+  },
+  "activities": [
+    {
+      "accountId": null,
+      "comment": null,
+      "fee": 0,
+      "quantity": 1,
+      "type": "ITEM",
+      "unitPrice": 500000,
+      "currency": "USD",
+      "dataSource": "MANUAL",
+      "date": "2022-01-01T00:00:00.000Z",
+      "symbol": "Penthouse Apartment"
+    }
+  ]
+}
--- a/test/import/ok/sample.csv
+++ b/test/import/ok/sample.csv
@ -2,5 +2,5 @@ Date,Code,DataSource,Currency,Price,Quantity,Action,Fee,Note
 01-09-2021,Account Opening Fee,MANUAL,USD,0,0,fee,49,
 16-09-2021,MSFT,YAHOO,USD,298.580,5,buy,19.00,My first order 🤓
 17/11/2021,MSFT,YAHOO,USD,0.62,5,dividend,0.00,
-01.01.2022,Penthouse Apartment,MANUAL,USD,500000.0,1,item,0.00,
+01.01.2022,Penthouse Apartment,MANUAL,USD,500000.0,1,buy,0.00,
 20500606,US5949181045,YAHOO,USD,0.00,0,buy,0.00,
--- a/test/import/ok/sample.json
+++ b/test/import/ok/sample.json
@ -41,7 +41,7 @@
      "comment": null,
      "fee": 0,
      "quantity": 1,
-      "type": "ITEM",
+      "type": "BUY",
      "unitPrice": 500000,
      "currency": "USD",
      "dataSource": "MANUAL",
--- a/test/import/ok/without-accounts.json
+++ b/test/import/ok/without-accounts.json
@ -17,7 +17,7 @@
    {
      "fee": 0,
      "quantity": 1,
-      "type": "ITEM",
+      "type": "BUY",
      "unitPrice": 500000,
      "currency": "USD",
      "dataSource": "MANUAL",