Merge pull request #78 from tweedegolf/testing-client

add `MockClientRef` to be able to test the VTN and client together

Cargo.toml

@@ -30,11 +30,11 @@ iso8601-duration = { version = "0.2.0", features = ["chrono"] }
 rangemap = "1.5.1"
 jsonwebtoken = "9.3.0"
 async-trait = "0.1.81"
+tower = { version = "0.4", features = ["util"] }
+http-body-util = "0.1.0"
 
 [dev-dependencies]
 quickcheck = "1.0.3"
-tower = { version = "0.4", features = ["util"] }
-http-body-util = "0.1.0"
 mime = "0.3"
 tokio = { version = "1.37.0", features = ["full", "test-util"] }
 

src/bin/everest.rs

@@ -4,7 +4,7 @@ use openadr::{
         event::{EventType, EventValuesMap},
         values_map::Value,
     },
-    ProgramClient, Target, Timeline,
+    ClientRef, ProgramClient, Target, Timeline,
 };
 use std::{error::Error, time::Duration};
 use tokio::sync::mpsc::{Receiver, Sender};
@@ -39,7 +39,7 @@ impl Clock for ChronoClock {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let client = openadr::Client::new("http://localhost:3000/".try_into()?, None);
+    let client = openadr::Client::with_url("http://localhost:3000/".try_into()?, None);
     let program = client.get_program(Target::Program("name")).await?;
 
     // channel used to send new timelines
@@ -60,7 +60,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 async fn poll_timeline(
-    mut program: ProgramClient,
+    mut program: ProgramClient<impl ClientRef>,
     poll_interval: std::time::Duration,
     sender: mpsc::Sender<Timeline>,
 ) -> Result<(), openadr::Error> {

src/cli/main.rs

@@ -2,7 +2,7 @@ use openadr::{ClientCredentials, ProgramContent, Target};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let client = openadr::Client::new(
+    let client = openadr::Client::with_url(
         "http://localhost:3000/".try_into()?,
         Some(ClientCredentials::new(
             "admin".to_string(),

src/client/event.rs

@@ -1,24 +1,23 @@
 use std::sync::Arc;
 
 use crate::{
+    client::ClientRef,
     wire::{
         report::{ReportContent, ReportObjectType},
         Event, Report,
     },
     EventContent, ReportClient, Result,
 };
 
-use super::ClientRef;
-
 #[derive(Debug)]
-pub struct EventClient {
-    client: Arc<ClientRef>,
+pub struct EventClient<C> {
+    client: Arc<C>,
     data: Event,
 }
 
-impl EventClient {
-    pub(super) fn from_event(client: Arc<ClientRef>, event: Event) -> EventClient {
-        EventClient {
+impl<C: ClientRef> EventClient<C> {
+    pub(super) fn from_event(client: Arc<C>, event: Event) -> Self {
+        Self {
             client,
             data: event,
         }
@@ -75,7 +74,7 @@ impl EventClient {
     }
 
     /// Create a new report for the event
-    pub async fn create_report(&self, report_data: ReportContent) -> Result<ReportClient> {
+    pub async fn create_report(&self, report_data: ReportContent) -> Result<ReportClient<C>> {
         if report_data.program_id != self.data().program_id {
             return Err(crate::Error::InvalidParentObject);
         }
@@ -93,7 +92,7 @@ impl EventClient {
         client_name: Option<&str>,
         skip: usize,
         limit: usize,
-    ) -> Result<Vec<ReportClient>> {
+    ) -> Result<Vec<ReportClient<C>>> {
         let skip_str = skip.to_string();
         let limit_str = limit.to_string();
 
@@ -116,8 +115,8 @@ impl EventClient {
     }
 
     /// Get all reports from the VTN for a specific client, trying to paginate whenever possible
-    pub async fn get_client_reports(&self, client_name: &str) -> Result<Vec<ReportClient>> {
-        let page_size = self.client.default_page_size;
+    pub async fn get_client_reports(&self, client_name: &str) -> Result<Vec<ReportClient<C>>> {
+        let page_size = self.client.default_page_size();
         let mut reports = vec![];
         let mut page = 0;
         loop {
@@ -140,8 +139,8 @@ impl EventClient {
     }
 
     /// Get all reports from the VTN, trying to paginate whenever possible
-    pub async fn get_all_reports(&self) -> Result<Vec<ReportClient>> {
-        let page_size = self.client.default_page_size;
+    pub async fn get_all_reports(&self) -> Result<Vec<ReportClient<C>>> {
+        let page_size = self.client.default_page_size();
         let mut reports = vec![];
         let mut page = 0;
         loop {