Merge pull request #329 from guyluz11/dev

Organized the project

bin/cbj_hub.dart

@@ -3,15 +3,8 @@ import 'dart:io';
 import 'package:cbj_hub/application/boot_up/boot_up.dart';
 import 'package:cbj_hub/infrastructure/cbj_web_server/cbj_web_server_repository.dart';
 import 'package:cbj_hub/infrastructure/mqtt_server/mqtt_server_repository.dart';
-import 'package:cbj_integrations_controller/infrastructure/bindings/binding_repository.dart';
-import 'package:cbj_integrations_controller/infrastructure/local_db/local_db_hive_repository.dart';
 import 'package:cbj_integrations_controller/infrastructure/node_red/node_red_repository.dart';
-import 'package:cbj_integrations_controller/infrastructure/room/saved_rooms_repo.dart';
-import 'package:cbj_integrations_controller/infrastructure/routines/routine_repository.dart';
-import 'package:cbj_integrations_controller/infrastructure/saved_devices/saved_devices_repo.dart';
-import 'package:cbj_integrations_controller/infrastructure/scenes/scene_repository.dart';
 import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
 import 'package:cbj_integrations_controller/initialize_integrations_controller.dart';
 import 'package:cbj_integrations_controller/injection.dart';
 import 'package:network_tools/network_tools.dart';
@@ -26,20 +19,13 @@ Future<void> main(List<String> arguments) async {
     env: Env.devPc,
   );
 
-  await BootUp.setup();
+  BootUp();
 }
 
 /// All instances of Repos
 void setInstancesOfRepos(String projectRootDirectoryPath) {
-  SystemCommandsManager();
   MqttServerRepository();
   CbjWebServerRepository();
-  SavedRoomsRepo();
-  SavedDevicesRepo();
-  RoutineCbjRepository();
-  HiveRepository();
   NodeRedRepository();
-  BindingCbjRepository();
-  SceneCbjRepository();
-  SharedVariables(projectRootDirectoryPath);
+  SharedVariables().projectRootDirectoryPath = projectRootDirectoryPath;
 }

lib/application/boot_up/boot_up.dart

@@ -1,21 +1,13 @@
 import 'package:cbj_hub/application/connector/connector.dart';
-import 'package:cbj_integrations_controller/domain/rooms/i_saved_rooms_repo.dart';
-import 'package:cbj_integrations_controller/domain/scene/i_scene_cbj_repository.dart';
 import 'package:cbj_integrations_controller/initialize_integrations_controller.dart';
 
 class BootUp {
   BootUp() {
     setup();
   }
 
-  static Future<void> setup() async {
-    // Return all saved rooms
-    await ISavedRoomsRepo.instance.getAllRooms();
-
-    await ISceneCbjRepository.instance.getAllScenesAsMap();
-
+  Future<void> setup() async {
     await setupIntegrationsController();
-
     Connector.startConnector();
   }
 }

lib/application/connector/connector.dart

@@ -7,13 +7,13 @@ import 'package:cbj_integrations_controller/domain/room/room_entity.dart';
 import 'package:cbj_integrations_controller/domain/room/value_objects_room.dart';
 import 'package:cbj_integrations_controller/domain/rooms/i_saved_rooms_repo.dart';
 import 'package:cbj_integrations_controller/domain/saved_devices/i_saved_devices_repo.dart';
-import 'package:cbj_integrations_controller/infrastructure/devices/companies_connector_conjector.dart';
+import 'package:cbj_integrations_controller/infrastructure/devices/companies_connector_conjecture.dart';
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart';
 import 'package:cbj_integrations_controller/infrastructure/generic_devices/abstract_device/device_entity_abstract.dart';
 import 'package:cbj_integrations_controller/infrastructure/generic_devices/abstract_device/device_entity_dto_abstract.dart';
+import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart';
 import 'package:cbj_integrations_controller/utils.dart';
 import 'package:mqtt_client/mqtt_client.dart';
-import 'package:rxdart/rxdart.dart';
 
 class Connector {
   static Future<void> startConnector() async {
@@ -35,7 +35,7 @@ class Connector {
     final ISavedDevicesRepo savedDevicesRepo = ISavedDevicesRepo.instance;
 
     final Map<String, DeviceEntityAbstract> allDevices =
-        await savedDevicesRepo.getAllDevices();
+        await savedDevicesRepo.getAllDevicesAfterInitialize();
 
     for (final String deviceId in allDevices.keys) {
       ConnectorStreamToMqtt.toMqttController.add(
@@ -53,7 +53,7 @@ class Connector {
 
     IMqttServerRepository.instance.sendToApp();
 
-    CompaniesConnectorConjector.updateAllDevicesReposWithDeviceChanges(
+    CompaniesConnectorConjecture().updateAllDevicesReposWithDeviceChanges(
       ConnectorDevicesStreamFromMqtt.fromMqttStream,
     );
 
@@ -135,19 +135,3 @@ class Connector {
     }
   }
 }
-
-/// Connect all streams from the internet devices into one stream that will be
-/// send to mqtt broker to update devices states
-class ConnectorStreamToMqtt {
-  static StreamController<MapEntry<String, dynamic>> toMqttController =
-      StreamController();
-
-  static Stream<MapEntry<String, dynamic>> get toMqttStream =>
-      toMqttController.stream.asBroadcastStream();
-}
-
-/// Connect all streams from the mqtt devices changes into one stream that will
-/// be sent to whoever need to be notify of changes
-class ConnectorDevicesStreamFromMqtt {
-  static BehaviorSubject<dynamic> fromMqttStream = BehaviorSubject<dynamic>();
-}