Merge pull request #701 from CyBear-Jinni/Changing_grpc

Changing grpc
CyBear-Jinni · Dec 15, 2023 · d631d9e · d631d9e
2 parents 49381b1 + 74adc42
commit d631d9e
Show file tree

Hide file tree

Showing 224 changed files with 1,813 additions and 10,859 deletions.
diff --git a/.directory b/.directory
diff --git a/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
diff --git a/.github/workflows/CONTRIBUTING.md → .github/CONTRIBUTING.md b/.github/workflows/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/.github/workflows/pull_request_template.md → .github/PULL_REQUEST_TEMPLATE.md b/.github/workflows/pull_request_template.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
@@ -152,3 +152,8 @@ smart_home_flutter/gen/
 
 .fvm/
 
+# melos
+pubspec_overrides.yaml
+
+# Linux
+.directory
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -17,7 +17,6 @@ analyzer:
     - "**/*.config.dart"
     - "lib/infrastructure/core/gen/**"
 
-
 linter:
   rules:
     # Use parameter order as in json response

diff --git a/gradle.properties b/gradle.properties
diff --git a/lib/domain/cbj_comp/cbj_comp_entity.dart b/lib/domain/cbj_comp/cbj_comp_entity.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_light_device/generic_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_failures.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_value_objects.dart';
 import 'package:dartz/dartz.dart';

diff --git a/lib/domain/cbj_comp/cbj_comp_validators.dart b/lib/domain/cbj_comp/cbj_comp_validators.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_light_device/generic_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_failures.dart';
 import 'package:dartz/dartz.dart';
 import 'package:kt_dart/kt.dart';

diff --git a/lib/domain/cbj_comp/cbj_comp_value_objects.dart b/lib/domain/cbj_comp/cbj_comp_value_objects.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_light_device/generic_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_errors.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_failures.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_validators.dart';

diff --git a/lib/domain/device/devices_validators.dart b/lib/domain/device/devices_validators.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/device_type_enums.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart';
 import 'package:cybear_jinni/domain/device/devices_failures.dart';
 import 'package:dartz/dartz.dart';
 
@@ -67,21 +67,21 @@ Either<DevicesFailure<String>, String> validateDeviceMaxNameLength(
 }
 
 Either<DevicesFailure<String>, String> validateDeviceStateExist(String input) {
-  if (EnumHelperCbj.stringToDeviceState(input) != null) {
+  if (EntityUtils.stringToDeviceState(input) != null) {
     return right(input);
   }
   return left(const DevicesFailure.deviceActionDoesNotExist());
 }
 
 Either<DevicesFailure<String>, String> validateDeviceActionExist(String input) {
-  if (EnumHelperCbj.stringToDeviceAction(input) != null) {
+  if (EntityUtils.stringToDeviceAction(input) != null) {
     return right(input);
   }
   return left(const DevicesFailure.deviceActionDoesNotExist());
 }
 
 Either<DevicesFailure<String>, String> validateDeviceTypeExist(String input) {
-  if (EnumHelperCbj.stringToDt(input) != null) {
+  if (EntityUtils.stringToDt(input) != null) {
     return right(input);
   }
   return left(const DevicesFailure.deviceTypeDoesNotExist());

diff --git a/lib/domain/device/i_device_repository.dart b/lib/domain/device/i_device_repository.dart
@@ -5,30 +5,30 @@ import 'dart:io';
 import 'package:cbj_integrations_controller/domain/room/room_entity.dart';
 import 'package:cbj_integrations_controller/infrastructure/devices/device_helper/device_helper.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/generic_devices/generic_blinds_device/generic_blinds_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_blinds_device/generic_blinds_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_boiler_device/generic_boiler_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_boiler_device/generic_boiler_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_dimmable_light_device/generic_dimmable_light_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_dimmable_light_device/generic_dimmable_light_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_light_device/generic_light_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_light_device/generic_light_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_rgbw_light_device/generic_rgbw_light_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_rgbw_light_device/generic_rgbw_light_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_computer_device/generic_smart_computer_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_computer_device/generic_smart_computer_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_plug_device/generic_smart_plug_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_plug_device/generic_smart_plug_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_tv/generic_smart_tv_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_smart_tv/generic_smart_tv_value_objects.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_switch_device/generic_switch_entity.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/generic_switch_device/generic_switch_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_abstract.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/abstract_entity/device_entity_dto_abstract.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_blinds_entity/generic_blinds_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_boiler_entity/generic_boiler_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_dimmable_light_entity/generic_dimmable_light_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_light_entity/generic_light_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_rgbw_light_entity/generic_rgbw_light_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_computer_entity/generic_smart_computer_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_plug_entity/generic_smart_plug_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_smart_tv_entity/generic_smart_tv_value_objects.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_entity.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/generic_switch_entity/generic_switch_value_objects.dart';
 import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart';
 import 'package:cybear_jinni/domain/device/devices_failures.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:cybear_jinni/infrastructure/hub_client/hub_requests_routing.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
 import 'package:dartz/dartz.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/domain/i_hub_connection_repository.dart b/lib/domain/i_hub_connection_repository.dart
@@ -5,14 +5,14 @@ import 'package:cbj_integrations_controller/domain/hub/hub_entity.dart';
 import 'package:cbj_integrations_controller/domain/hub/hub_failures.dart';
 import 'package:cbj_integrations_controller/domain/hub/hub_value_objects.dart';
 import 'package:cbj_integrations_controller/domain/local_db/local_db_failures.dart';
+import 'package:cbj_integrations_controller/infrastructure/core/utils.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/hub_client/hub_client.dart';
 import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client_demo.dart';
 import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_dtos.dart';
-import 'package:cbj_integrations_controller/utils.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cybear_jinni/domain/i_local_db_repository.dart';
-import 'package:cybear_jinni/presentation/core/injection.dart';
+import 'package:cybear_jinni/infrastructure/core/injection.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:location/location.dart';

diff --git a/lib/domain/i_local_db_repository.dart b/lib/domain/i_local_db_repository.dart
@@ -1,8 +1,8 @@
 import 'package:cbj_integrations_controller/domain/local_db/local_db_failures.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:cybear_jinni/infrastructure/isar_local_db/isar_objects/home_entity_isar_model.dart';
 import 'package:cybear_jinni/infrastructure/isar_local_db/isar_objects/hub_entity_isar_model.dart';
 import 'package:cybear_jinni/infrastructure/isar_local_db/isar_objects/remote_pipes_isar_model.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
 import 'package:dartz/dartz.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider/path_provider.dart';

diff --git a/lib/domain/i_notification_service.dart b/lib/domain/i_notification_service.dart
@@ -1,4 +1,4 @@
-import 'package:cybear_jinni/presentation/core/utils.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_timezone/flutter_timezone.dart';

diff --git a/lib/domain/i_phone_as_hub.dart b/lib/domain/i_phone_as_hub.dart
@@ -1,13 +1,11 @@
 import 'dart:async';
+import 'dart:collection';
 
-import 'package:cbj_integrations_controller/domain/mqtt_server/i_mqtt_server_repository.dart';
-import 'package:cbj_integrations_controller/domain/saved_devices/i_saved_devices_repo.dart';
-import 'package:cbj_integrations_controller/infrastructure/devices/companies_connector_conjecture.dart';
-import 'package:cbj_integrations_controller/infrastructure/devices/helper_methods/device_helper_methods.dart';
-import 'package:cbj_integrations_controller/infrastructure/generic_devices/abstract_device/device_entity_abstract.dart';
-import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
-import 'package:network_tools/network_tools.dart';
+import 'package:cbj_integrations_controller/infrastructure/devices_service.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_entities/abstract_entity/device_entity_abstract.dart';
+import 'package:cbj_integrations_controller/infrastructure/generic_entities/entity_type_utils.dart';
+import 'package:cbj_integrations_controller/infrastructure/search_devices.dart';
 
 part 'package:cybear_jinni/infrastructure/phone_as_hub.dart';
 
@@ -20,8 +18,16 @@ abstract interface class IPhoneAsHub {
 
   Future searchDevices();
 
-  Future<Map<String, DeviceEntityAbstract>> get getAllDevices;
+  void setEntityState({
+    required HashMap<VendorsAndServices, HashSet<String>> uniqueIdByVendor,
+    required EntityProperties property,
+    required EntityActions actionType,
+    dynamic value,
+  });
+
+  Future<Map<String, DeviceEntityAbstract>> get getAllEntities;
 
   void startListen();
+
   Future dispose();
 }
diff --git a/lib/domain/manage_network/i_manage_network_repository.dart b/lib/domain/manage_network/i_manage_network_repository.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:cybear_jinni/domain/home_user/home_user_failures.dart';
 import 'package:cybear_jinni/domain/manage_network/manage_network_entity.dart';
 import 'package:cybear_jinni/domain/manage_network/manage_network_value_objects.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/services.dart';
 import 'package:kt_dart/collection.dart';

diff --git a/lib/domain/security_bear/i_security_bear_connection_repository.dart b/lib/domain/security_bear/i_security_bear_connection_repository.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cybear_jinni/domain/cbj_comp/cbj_comp_entity.dart';
 import 'package:cybear_jinni/domain/manage_network/i_manage_network_repository.dart';
@@ -8,10 +9,9 @@ import 'package:cybear_jinni/domain/manage_network/manage_network_value_objects.
 import 'package:cybear_jinni/domain/security_bear/security_bear_entity.dart';
 import 'package:cybear_jinni/domain/security_bear/security_bear_failures.dart';
 import 'package:cybear_jinni/domain/security_bear/security_bear_value_objects.dart';
-import 'package:cybear_jinni/infrastructure/core/gen/security_bear/client/protoc_as_dart/security_bear_connections.pbgrpc.dart';
+import 'package:cybear_jinni/infrastructure/core/injection.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:cybear_jinni/infrastructure/security_bear_client/security_bear_server_client.dart';
-import 'package:cybear_jinni/presentation/core/injection.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
 import 'package:location/location.dart';

diff --git a/lib/domain/software_info/i_software_info_repository.dart b/lib/domain/software_info/i_software_info_repository.dart
@@ -5,14 +5,14 @@ import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/pr
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart';
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/proto_gen_date.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/gen/security_bear_server_d/proto_gen_date.dart';
+import 'package:cbj_integrations_controller/infrastructure/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart';
 import 'package:cybear_jinni/domain/i_hub_connection_repository.dart';
 import 'package:cybear_jinni/domain/security_bear/i_security_bear_connection_repository.dart';
 import 'package:cybear_jinni/domain/security_bear/security_bear_failures.dart';
 import 'package:cybear_jinni/domain/software_info/software_info_entity.dart';
 import 'package:cybear_jinni/domain/software_info/software_info_failures.dart';
-import 'package:cybear_jinni/infrastructure/core/gen/security_bear/client/protoc_as_dart/security_bear_connections.pbgrpc.dart';
-import 'package:cybear_jinni/infrastructure/core/gen/security_bear/proto_gen_date.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:network_info_plus/network_info_plus.dart';
 import 'package:package_info_plus/package_info_plus.dart';

diff --git a/lib/domain/software_info/software_info_entity.dart b/lib/domain/software_info/software_info_entity.dart
@@ -1,8 +1,8 @@
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.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/gen/security_bear_server_d/protoc_as_dart/security_bear_connections.pbgrpc.dart';
 import 'package:cybear_jinni/domain/software_info/software_info_failures.dart';
 import 'package:cybear_jinni/domain/software_info/software_info_value_objects.dart';
-import 'package:cybear_jinni/infrastructure/core/gen/security_bear/client/protoc_as_dart/security_bear_connections.pbgrpc.dart';
 import 'package:cybear_jinni/infrastructure/software_info/software_info_dtos.dart';
 import 'package:dartz/dartz.dart';
 

diff --git a/lib/infrastructure/cbj_app_server_d.dart b/lib/infrastructure/cbj_app_server_d.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_app_server/protoc_as_dart/cbj_app_connections.pbgrpc.dart';
-import 'package:cybear_jinni/presentation/core/utils.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 import 'package:grpc/grpc.dart';
 
 /// The implantation of the CyBear Jinni App Server from grpc
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,3 +152,8 @@ smart_home_flutter/gen/ @@
     .fvm/
+    # melos
+    pubspec_overrides.yaml
+    # Linux
+    .directory