Touchups

Author: adborbas

Sources/Grodt/Application/migrations.swift

@@ -1,30 +1,27 @@
 import Vapor
 
 func migrations(_ app: Application) throws {
-    // 1) New tables
     app.migrations.add(Brokerage.Migration())
     app.migrations.add(BrokerageAccount.Migration())
 
-    // 2) Add nullable FK to transactions
-    app.migrations.add(Transaction.Migration_AddBrokerageAccountID())
-
-    // 4) Create historical perf tables
     app.migrations.add(HistoricalPortfolioPerformanceDaily.Migration())
     app.migrations.add(HistoricalBrokerageAccountPerformanceDaily.Migration())
     app.migrations.add(HistoricalBrokeragePerformanceDaily.Migration())
-
-    // 5) Drop platform/account and make FK required
-    app.migrations.add(Transaction.Migration_DropPlatformAccountAndMakeBARequired())
 
     app.migrations.add(User.Migration(preconfigured: app.config.preconfiguredUser, logger: app.logger))
     app.migrations.add(UserToken.Migration())
     app.migrations.add(Portfolio.Migration())
-//    app.migrations.add(Transaction.Migration())
+    
+    app.migrations.add(Transaction.Migration())
+    app.migrations.add(Transaction.Migration_AddBrokerageAccountID())
+    if app.environment != .testing {
+        app.migrations.add(Transaction.Migration_DropPlatformAccountAndMakeBARequired())
+    }
+    
     app.migrations.add(Currency.Migration())
     app.migrations.add(Ticker.Migration())
     app.migrations.add(Quote.Migration())
     app.migrations.add(HistoricalQuote.Migration())
 
-    // 6) Drop old portfolio performance
     app.migrations.add(DropOldHistoricalPortfolioPerformance())
 }

Sources/Grodt/Application/routes.swift

@@ -8,7 +8,7 @@ func routes(_ app: Application) async throws {
     let currencyDTOMapper = CurrencyDTOMapper()
     let tickerDTOMapper = TickerDTOMapper()
     let loginResponseDTOMapper = LoginResponseDTOMapper()
-    let transactionDTOMapper = TransactionDTOMapper(currencyDTOMapper: currencyDTOMapper)
+    let transactionDTOMapper = TransactionDTOMapper(currencyDTOMapper: currencyDTOMapper, database: app.db)
     let tickerRepository = PostgresTickerRepository(database: app.db)
     let livePriceService = LivePriceService(alphavantage: alphavantage)
     let quoteCache = PostgresQuoteRepository(database: app.db)
@@ -90,7 +90,8 @@ func routes(_ app: Application) async throws {
         try protected.register(collection: BrokerageController(brokerageRepository: brokerageRepository,
                                                                dtoMapper: BrokerageDTOMapper(brokerageRepository: brokerageRepository,
                                                                                              accountDTOMapper: BrokerageAccountDTOMapper(brokerageAccountRepository: brokerageAccountRepository,
-                                                                                                                                         currencyMapper: currencyDTOMapper)),
+                                                                                                                                         currencyMapper: currencyDTOMapper, database: app.db),
+                                                                                             database: app.db),
                                                                accounts: brokerageAccountRepository,
                                                                currencyMapper: currencyDTOMapper,
                                                                performanceRepository: brokerageDailyPerformanceRepository,
@@ -118,7 +119,7 @@ func routes(_ app: Application) async throws {
         )
         app.queues.schedule(nightlyUpdaterJob)
             .daily()
-            .at(13, 59)
+            .at(3, 0)
 
         app.queues.add(LoggingJobEventDelegate(logger: app.logger))
 

Sources/Grodt/DTOs/BrokerageDTO.swift

@@ -17,8 +17,17 @@ struct BrokerageAccountDTO: Codable {
 }
 
 struct PerformanceTotalsDTO: Codable {
-    let value: Decimal
-    let moneyIn: Decimal
+    private let value: Decimal
+    private let moneyIn: Decimal
+    
+    init(value: Decimal, moneyIn: Decimal) {
+        self.value = value
+        self.moneyIn = moneyIn
+    }
+    
+    init() {
+        self.init(value: 0, moneyIn: 0)
+    }
 }
 
 struct PerformancePointDTO: Codable {

Sources/Grodt/DTOs/CreateTransactionRequestDTO.swift

@@ -3,8 +3,6 @@ import Foundation
 struct CreateTransactionRequestDTO: Decodable {
     let portfolio: String
     let brokerageAccountID: String?
-    let platform: String
-    let account: String?
     let purchaseDate: Date
     let ticker: String
     let currency: String
@@ -20,8 +18,6 @@ struct CreateTransactionRequestDTO: Decodable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         portfolio = try container.decode(String.self, forKey: .portfolio)
         brokerageAccountID = try container.decodeIfPresent(String.self, forKey: .brokerageAccountID)
-        platform = try container.decode(String.self, forKey: .platform)
-        account = try container.decodeIfPresent(String.self, forKey: .account)
         ticker = try container.decode(String.self, forKey: .ticker)
         currency = try container.decode(String.self, forKey: .currency)
         fees = try container.decode(Decimal.self, forKey: .fees)

Sources/Grodt/DTOs/DTOMappers/InvestmentDTOMapper.swift

@@ -58,9 +58,9 @@ class InvestmentDTOMapper {
         }
     }
 
-    func investmentDetail(from transactions: [Transaction])async throws -> InvestmentDetailDTO {
+    func investmentDetail(from transactions: [Transaction]) async throws -> InvestmentDetailDTO {
         let investmentDTO = try await investments(from: transactions).first!
-        let transactions = transactions.compactMap { transactionDTOMapper.transaction(from: $0) }
+        let transactions = try await transactions.asyncCompactMap { try await transactionDTOMapper.transaction(from: $0) }
         return InvestmentDetailDTO(name: investmentDTO.name,
                                    shortName: investmentDTO.shortName,
                                    avgBuyPrice: investmentDTO.avgBuyPrice,

Sources/Grodt/DTOs/DTOMappers/PerformancePointDTOMapper.swift

@@ -4,4 +4,4 @@ struct PerformancePointDTOMapper {
                                    value: enity.value,
                                    moneyIn: enity.moneyIn)
     }
-}
+}

Sources/Grodt/DTOs/DTOMappers/PortfolioDTOMapper.swift

@@ -17,7 +17,7 @@ class PortfolioDTOMapper {
     func portfolio(from portfolio: Portfolio) async throws -> PortfolioDTO {
 
         let investments = try await investmentDTOMapper.investments(from: portfolio.transactions)
-        let transactions = portfolio.transactions.map { transactionDTOMapper.transaction(from: $0) }
+        let transactions = try await portfolio.transactions.asyncMap { try await transactionDTOMapper.transaction(from: $0) }
         return try await  PortfolioDTO(id: portfolio.id?.uuidString ?? "",
                                        name: portfolio.name,
                                        currency: currencyDTOMapper.currency(from: portfolio.currency),