Merge branch 'device_slot' of https://github.com/mrBluestSky/ts_lora_…

…chirpstack.git into device_slot

Makefile

@@ -72,3 +72,20 @@ test-all:
 	cd chirpstack-integration && cargo test
 	cd lrwn && make test
 	cd lrwn-filters && make test
+
+# does everything above
+compile-everything:
+	cd api && make grpc-web
+	cd ui && make build
+	docker compose up -d 
+	cd api && make rust
+	cd backend && cargo test
+	cd chirpstack && make test
+	cd lrwn && make test
+	cd lrwn-filters && make test
+	cargo install cross --version 0.2.5
+	cargo install diesel_cli --version 2.1.1 --no-default-features --features postgres
+	cargo install cargo-deb --version 1.43.1
+	cargo install cargo-generate-rpm --version 0.12.1
+	cd api && make grpc-web
+	cd chirpstack && make dist

README.md

@@ -59,6 +59,14 @@ Or if you do not have Nix installed, execute the following command:
 make docker-devshell
 ```
 
+### Do everything below
+
+If you want to automatically do all the steps below with make dist, enter this command:
+
+```bash
+make compile-everything
+```
+
 ### Building the UI
 
 To build the ChirpStack UI, execute the following command:

chirpstack/src/api/device.rs

@@ -474,8 +474,8 @@ impl DeviceService for Device {
             .await?;
 
         let dev_addr = DevAddr::from_str(&req_ds.dev_addr).map_err(|e| e.status())?;
-        let multicast_group_id = Uuid::from_str(&req_ds.multicast_group_id).map_err(|e| e.status())?;
-
+        let multicast_group_id =
+            Uuid::from_str(&req_ds.multicast_group_id).map_err(|e| e.status())?;
 
         let ds = device_slot::DeviceSlot {
             dev_eui,
@@ -509,12 +509,15 @@ impl DeviceService for Device {
         let slot: u32 = match ds.slot {
             Some(s) => s as u32,
             None => return Err(Status::invalid_argument("Slot is missing")),
-        };    
+        };
         let dev_addr = match ds.dev_addr {
             Some(addr) => addr.to_string(),
-            None => return Err(Status::invalid_argument("DevAddr is missing or not specified")),
+            None => {
+                return Err(Status::invalid_argument(
+                    "DevAddr is missing or not specified",
+                ))
+            }
         };
-
 
         let response = api::GetDeviceSlotResponse {
             dev_addr,
@@ -553,7 +556,9 @@ impl DeviceService for Device {
             created_at: ds.created_at,
         };
 
-        device_slot::update(updated_ds).await.map_err(|e| e.status())?;
+        device_slot::update(updated_ds)
+            .await
+            .map_err(|e| e.status())?;
 
         Ok(Response::new(()))
     }
@@ -573,7 +578,9 @@ impl DeviceService for Device {
             )
             .await?;
 
-            device_slot::delete(&dev_eui).await.map_err(|e| e.status())?;
+        device_slot::delete(&dev_eui)
+            .await
+            .map_err(|e| e.status())?;
 
         Ok(Response::new(()))
     }

chirpstack/src/api/tenant.rs

@@ -6,6 +6,8 @@ use uuid::Uuid;
 use chirpstack_api::api;
 use chirpstack_api::api::tenant_service_server::TenantService;
 
+// ./chirpstack/src/api/auth/validator.rs is super::auth::validator
+// validator::RequestValidator is an empty struct with lots of traits connected to databases
 use super::auth::{validator, AuthID};
 use super::error::ToStatus;
 use super::helpers;
@@ -23,6 +25,7 @@ impl Tenant {
 
 #[tonic::async_trait]
 impl TenantService for Tenant {
+    // I guess this function creates an instance of a tenant
     async fn create(
         &self,
         request: Request<api::CreateTenantRequest>,