refactor: remove contracts snapshot from caches

packages/cli/lib/behavior/trader.dart

@@ -246,7 +246,7 @@ Future<JobResult> _handleContractDealAtDestination(
     const Duration(minutes: 10),
   );
   final contract = assertNotNull(
-    caches.contracts.contract(contractId),
+    await db.contractById(contractId),
     'No contract.',
     const Duration(minutes: 10),
   );
@@ -255,7 +255,6 @@ Future<JobResult> _handleContractDealAtDestination(
     api,
     db,
     caches.agent,
-    caches.contracts,
     caches.ships,
     ship,
     contract,
@@ -308,7 +307,6 @@ Future<Contract?> _deliverContractGoodsIfPossible(
   Api api,
   Database db,
   AgentCache agentCache,
-  ContractSnapshot contractSnapshot,
   ShipSnapshot shipCache,
   Ship ship,
   Contract beforeDelivery,
@@ -339,7 +337,6 @@ Future<Contract?> _deliverContractGoodsIfPossible(
     await acceptContractAndLog(
       api,
       db,
-      contractSnapshot,
       agentCache,
       ship,
       beforeDelivery,
@@ -352,7 +349,6 @@ Future<Contract?> _deliverContractGoodsIfPossible(
     api,
     ship,
     shipCache,
-    contractSnapshot,
     beforeDelivery,
     tradeSymbol: tradeSymbol,
     units: unitsBefore,
@@ -557,30 +553,28 @@ String describeExpectedContractProfit(
 Future<DateTime?> acceptContractsIfNeeded(
   Api api,
   Database db,
-  ContractSnapshot contractSnapshot,
   MarketPriceSnapshot marketPrices,
   AgentCache agentCache,
   ShipSnapshot shipCache,
   Ship ship,
 ) async {
   /// Accept logic we run any time contract trading is turned on.
-  final contracts = contractSnapshot.activeContracts;
-  if (contracts.isEmpty) {
+  final activeContracts = await db.activeContracts();
+  if (activeContracts.isEmpty) {
     final contract = await negotiateContractAndLog(
       db,
       api,
       ship,
       shipCache,
-      contractSnapshot,
     );
     shipInfo(ship, describeExpectedContractProfit(marketPrices, contract));
     return null;
   }
-  for (final contract in contractSnapshot.unacceptedContracts) {
+  final unacceptedContracts = await db.unacceptedContracts();
+  for (final contract in unacceptedContracts) {
     await acceptContractAndLog(
       api,
       db,
-      contractSnapshot,
       agentCache,
       ship,
       contract,
@@ -883,18 +877,19 @@ Future<JobResult> _initDeal(
     await acceptContractsIfNeeded(
       api,
       db,
-      caches.contracts,
       caches.marketPrices,
       caches.agent,
       caches.ships,
       ship,
     );
   }
 
+  final contractSnapshot = await ContractSnapshot.load(db);
+
   // Consider all deals starting at any market within our consideration range.
   var newDeal = centralCommand.findNextDealAndLog(
     caches.agent,
-    caches.contracts,
+    contractSnapshot,
     caches.marketPrices,
     caches.systems,
     caches.systemConnectivity,
@@ -928,7 +923,7 @@ Future<JobResult> _initDeal(
       findDeal: (Ship ship, WaypointSymbol startSymbol) {
         return centralCommand.findNextDealAndLog(
           caches.agent,
-          caches.contracts,
+          contractSnapshot,
           caches.marketPrices,
           caches.systems,
           caches.systemConnectivity,

packages/cli/lib/cache/caches.dart

@@ -55,7 +55,6 @@ class Caches {
     required this.systems,
     required this.waypoints,
     required this.markets,
-    required this.contracts,
     required this.behaviors,
     required this.charting,
     required this.routePlanner,
@@ -78,9 +77,6 @@ class Caches {
   // TODO(eseidel): Try not caching ships and just fetching from db.
   ShipSnapshot ships;
 
-  /// The contract cache.
-  ContractSnapshot contracts;
-
   /// Known shipyard listings.
   ShipyardListingSnapshot shipyardListings;
 
@@ -148,7 +144,7 @@ class Caches {
     );
     final markets = MarketCache(db, api, static.tradeGoods);
     // Intentionally force refresh contracts in case we've been offline.
-    final contracts = await fetchContracts(db, api);
+    await fetchContracts(db, api);
     final behaviors = await BehaviorCache.load(db);
 
     final jumpGates = await JumpGateSnapshot.load(db);
@@ -171,7 +167,6 @@ class Caches {
       systems: systems,
       waypoints: waypoints,
       markets: markets,
-      contracts: contracts,
       behaviors: behaviors,
       charting: charting,
       static: static,
@@ -208,7 +203,7 @@ class Caches {
     // to run and update the status.
     ships = await ships.ensureUpToDate(db, api);
     await agent.ensureAgentUpToDate(api);
-    contracts = await contracts.ensureUpToDate(db, api);
+    await fetchContracts(db, api);
 
     marketListings = await MarketListingSnapshot.load(db);
     shipyardListings = await ShipyardListingSnapshot.load(db);

packages/cli/lib/net/actions.dart

@@ -578,7 +578,6 @@ Future<Contract> negotiateContractAndLog(
   Api api,
   Ship ship,
   ShipSnapshot shipCache,
-  ContractSnapshot contractSnapshot,
 ) async {
   await dockIfNeeded(db, api, shipCache, ship);
   final response = await api.fleet.negotiateContract(ship.symbol);
@@ -594,7 +593,6 @@ Future<Contract> negotiateContractAndLog(
 Future<AcceptContract200ResponseData> acceptContractAndLog(
   Api api,
   Database db,
-  ContractSnapshot contractSnapshot,
   AgentCache agentCache,
   Ship ship,
   Contract contract,

packages/cli/lib/net/direct.dart

@@ -1,7 +1,6 @@
 import 'package:cli/api.dart';
 import 'package:cli/cache/agent_cache.dart';
 import 'package:cli/cache/construction_cache.dart';
-import 'package:cli/cache/contract_snapshot.dart';
 import 'package:cli/cache/ship_cache.dart';
 import 'package:db/db.dart';
 import 'package:types/types.dart';
@@ -124,7 +123,6 @@ Future<DeliverContract200ResponseData> deliverContract(
   Api api,
   Ship ship,
   ShipSnapshot shipCache,
-  ContractSnapshot contractSnapshot,
   Contract contract, {
   required TradeSymbol tradeSymbol,
   required int units,

packages/cli/test/behavior/trader_test.dart

@@ -15,6 +15,8 @@ class _MockCentralCommand extends Mock implements CentralCommand {}
 
 class _MockContractsApi extends Mock implements ContractsApi {}
 
+class _MockContractSnapshot extends Mock implements ContractSnapshot {}
+
 class _MockDatabase extends Mock implements Database {}
 
 class _MockFleetApi extends Mock implements FleetApi {}
@@ -56,6 +58,8 @@ void main() {
     when(() => centralCommand.isContractTradingEnabled).thenReturn(false);
     when(() => centralCommand.expectedCreditsPerSecond(ship)).thenReturn(10);
     final caches = mockCaches();
+    final contractSnapshot = _MockContractSnapshot();
+    when(db.allContracts).thenAnswer((_) async => <Contract>[]);
 
     final start = WaypointSymbol.fromString('S-A-B');
     final end = WaypointSymbol.fromString('S-A-C');
@@ -131,7 +135,7 @@ void main() {
     when(
       () => centralCommand.findNextDealAndLog(
         caches.agent,
-        caches.contracts,
+        contractSnapshot,
         caches.marketPrices,
         caches.systems,
         caches.systemConnectivity,
@@ -513,7 +517,7 @@ void main() {
     when(() => centralCommand.isContractTradingEnabled).thenReturn(true);
     when(() => centralCommand.expectedCreditsPerSecond(ship)).thenReturn(1);
     final caches = mockCaches();
-    when(() => caches.contracts.activeContracts).thenReturn([]);
+    when(db.activeContracts).thenAnswer((_) async => <Contract>[]);
     final contract = Contract(
       id: 'id',
       factionSymbol: 'factionSymbol',
@@ -622,10 +626,11 @@ void main() {
       costPerFuelUnit: 100,
       costPerAntimatterUnit: 10000,
     );
+    final contractSnapshot = _MockContractSnapshot();
     when(
       () => centralCommand.findNextDealAndLog(
         caches.agent,
-        caches.contracts,
+        contractSnapshot,
         caches.marketPrices,
         caches.systems,
         caches.systemConnectivity,
@@ -694,6 +699,7 @@ void main() {
 
     registerFallbackValue(Contract.fallbackValue());
     when(() => db.upsertContract(any())).thenAnswer((_) async {});
+    when(db.allContracts).thenAnswer((_) async => <Contract>[]);
 
     final logger = _MockLogger();
     final waitUntil = await runWithLogger(
@@ -1086,7 +1092,7 @@ void main() {
       fulfilled: false,
       timestamp: now,
     );
-    when(() => caches.contracts.contract(contract.id)).thenReturn(contract);
+    when(() => db.contractById(contract.id)).thenAnswer((_) async => contract);
     final deal = Deal(
       destination: SellOpp.fromContract(
         waypointSymbol: end,

packages/cli/test/cache/caches_mock.dart

@@ -9,8 +9,6 @@ class _MockChartingCache extends Mock implements ChartingCache {}
 
 class _MockConstructionCache extends Mock implements ConstructionCache {}
 
-class _MockContractSnapshot extends Mock implements ContractSnapshot {}
-
 class _MockJumpGateSnapshot extends Mock implements JumpGateSnapshot {}
 
 class _MockMarketCache extends Mock implements MarketCache {}
@@ -76,7 +74,6 @@ Caches mockCaches() {
     waypoints: _MockWaypointCache(),
     markets: _MockMarketCache(),
     marketListings: _MockMarketListingSnapshot(),
-    contracts: _MockContractSnapshot(),
     behaviors: _MockBehaviorCache(),
     charting: _MockChartingCache(),
     routePlanner: _MockRoutePlanner(),

packages/cli/test/net/actions_test.dart

@@ -14,8 +14,6 @@ class _MockDatabase extends Mock implements Database {}
 
 class _MockChartingCache extends Mock implements ChartingCache {}
 
-class _MockContractSnapshot extends Mock implements ContractSnapshot {}
-
 class _MockContractsApi extends Mock implements ContractsApi {}
 
 class _MockFleetApi extends Mock implements FleetApi {}
@@ -787,7 +785,6 @@ void main() {
     final shipNav = _MockShipNav();
     when(() => ship.nav).thenReturn(shipNav);
     when(() => shipNav.waypointSymbol).thenReturn('S-A-W');
-    final contractSnapshot = _MockContractSnapshot();
     final contract = Contract.test(
       id: 'C-1',
       terms: ContractTerms(
@@ -823,7 +820,6 @@ void main() {
       await acceptContractAndLog(
         api,
         db,
-        contractSnapshot,
         agentCache,
         ship,
         contract,

packages/db/lib/db.dart

@@ -401,6 +401,19 @@ class Database {
     return queryMany(allContractsQuery(), contractFromColumnMap);
   }
 
+  Future<Contract?> contractById(String id) async {
+    final query = contractByIdQuery(id);
+    return queryOne(query, contractFromColumnMap);
+  }
+
+  Future<Iterable<Contract>> unacceptedContracts() async {
+    return queryMany(unacceptedContractsQuery(), contractFromColumnMap);
+  }
+
+  Future<Iterable<Contract>> activeContracts() async {
+    return queryMany(activeContractsQuery(), contractFromColumnMap);
+  }
+
   /// Upsert a contract into the database.
   Future<void> upsertContract(Contract contract) async {
     await execute(upsertContractQuery(contract));

packages/db/lib/src/contract.dart

@@ -17,6 +17,26 @@ Query upsertContractQuery(Contract contract) {
   );
 }
 
+/// Fetch a contract by id.
+Query contractByIdQuery(String id) {
+  return Query(
+    'SELECT * FROM contract_ WHERE id = @id',
+    parameters: <String, dynamic>{'id': id},
+  );
+}
+
+Query activeContractsQuery() {
+  return const Query(
+    "SELECT * FROM contract_ WHERE json->>'status' = 'active'",
+  );
+}
+
+Query unacceptedContractsQuery() {
+  return const Query(
+    "SELECT * FROM contract_ WHERE json->>'status' = 'unaccepted'",
+  );
+}
+
 /// Converts a contract from a column map.
 Contract contractFromColumnMap(Map<String, dynamic> map) {
   return Contract.fromJson(map['json'] as Map<String, dynamic>);