reorganzing functions.

This commit is contained in:
Jason Kulatunga 2022-08-28 21:32:13 -07:00
parent fa714d6bff
commit e6944cb4ee
4 changed files with 73 additions and 111 deletions

View File

@ -0,0 +1,68 @@
package base
import (
"context"
"encoding/json"
"fmt"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/config"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/models"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"net/http"
"strings"
"time"
)
type BaseClient struct {
AppConfig config.Interface
Logger logrus.FieldLogger
OauthClient *http.Client
Credential models.ProviderCredential
}
func NewBaseClient(appConfig config.Interface, globalLogger logrus.FieldLogger, credentials models.ProviderCredential, testHttpClient ...*http.Client) BaseClient {
var httpClient *http.Client
if len(testHttpClient) == 0 {
httpClient = oauth2.NewClient(context.Background(), oauth2.StaticTokenSource(
&oauth2.Token{
TokenType: "Bearer",
RefreshToken: credentials.RefreshToken,
AccessToken: credentials.AccessToken,
}))
} else {
//Testing mode.
httpClient = testHttpClient[0]
}
httpClient.Timeout = 10 * time.Second
return BaseClient{
AppConfig: appConfig,
Logger: globalLogger,
OauthClient: httpClient,
Credential: credentials,
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// HttpClient
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
func (c *BaseClient) GetRequest(resourceSubpath string, decodeModelPtr interface{}) error {
url := fmt.Sprintf("%s/%s", strings.TrimRight(c.Credential.ApiEndpointBaseUrl, "/"), strings.TrimLeft(resourceSubpath, "/"))
resp, err := c.OauthClient.Get(url)
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode >= 300 || resp.StatusCode < 200 {
return fmt.Errorf("An error occurred during request - %d - %s", resp.StatusCode, resp.Status)
}
err = json.NewDecoder(resp.Body).Decode(decodeModelPtr)
if err != nil {
return err
}
return err
}

View File

@ -1,48 +1,21 @@
package base
import (
"context"
"encoding/json"
"fmt"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/config"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/models"
"github.com/fastenhealth/gofhir-models/fhir401"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"net/http"
"strings"
"time"
)
type FHIR401Client struct {
AppConfig config.Interface
Logger logrus.FieldLogger
OauthClient *http.Client
Credential models.ProviderCredential
BaseClient
}
func NewFHIR401Client(appConfig config.Interface, globalLogger logrus.FieldLogger, credentials models.ProviderCredential, testHttpClient ...*http.Client) (FHIR401Client, error) {
var httpClient *http.Client
if len(testHttpClient) == 0 {
httpClient = oauth2.NewClient(context.Background(), oauth2.StaticTokenSource(
&oauth2.Token{
TokenType: "Bearer",
RefreshToken: credentials.RefreshToken,
AccessToken: credentials.AccessToken,
}))
} else {
//Testing mode.
httpClient = testHttpClient[0]
}
httpClient.Timeout = 10 * time.Second
return FHIR401Client{
AppConfig: appConfig,
Logger: globalLogger,
OauthClient: httpClient,
Credential: credentials,
NewBaseClient(appConfig, globalLogger, credentials, testHttpClient...),
}, nil
}
@ -64,22 +37,3 @@ func (c *FHIR401Client) GetPatient(patientId string) (*fhir401.Patient, error) {
err := c.GetRequest(fmt.Sprintf("Patient/%s", patientId), &patient)
return &patient, err
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// HttpClient
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
func (c *FHIR401Client) GetRequest(resourceSubpath string, decodeModelPtr interface{}) error {
url := fmt.Sprintf("%s/%s", strings.TrimRight(c.Credential.ApiEndpointBaseUrl, "/"), strings.TrimLeft(resourceSubpath, "/"))
resp, err := c.OauthClient.Get(url)
if err != nil {
return err
}
defer resp.Body.Close()
err = json.NewDecoder(resp.Body).Decode(decodeModelPtr)
if err != nil {
return err
}
return err
}

View File

@ -1,48 +1,21 @@
package base
import (
"context"
"encoding/json"
"fmt"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/config"
"github.com/fastenhealth/fastenhealth-onprem/backend/pkg/models"
"github.com/fastenhealth/gofhir-models/fhir430"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"net/http"
"strings"
"time"
)
type FHIR430Client struct {
AppConfig config.Interface
Logger logrus.FieldLogger
OauthClient *http.Client
Credential models.ProviderCredential
BaseClient
}
func NewFHIR430Client(appConfig config.Interface, globalLogger logrus.FieldLogger, credentials models.ProviderCredential, testHttpClient ...*http.Client) (FHIR430Client, error) {
var httpClient *http.Client
if len(testHttpClient) == 0 {
httpClient = oauth2.NewClient(context.Background(), oauth2.StaticTokenSource(
&oauth2.Token{
TokenType: "Bearer",
RefreshToken: credentials.RefreshToken,
AccessToken: credentials.AccessToken,
}))
} else {
//Testing mode.
httpClient = testHttpClient[0]
}
httpClient.Timeout = 10 * time.Second
return FHIR430Client{
AppConfig: appConfig,
Logger: globalLogger,
OauthClient: httpClient,
Credential: credentials,
NewBaseClient(appConfig, globalLogger, credentials, testHttpClient...),
}, nil
}
@ -64,22 +37,3 @@ func (c *FHIR430Client) GetPatient(patientId string) (*fhir430.Patient, error) {
return &patient, err
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// HttpClient
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
func (c *FHIR430Client) GetRequest(resourceSubpath string, decodeModelPtr interface{}) error {
url := fmt.Sprintf("%s/%s", strings.TrimRight(c.Credential.ApiEndpointBaseUrl, "/"), strings.TrimLeft(resourceSubpath, "/"))
resp, err := c.OauthClient.Get(url)
if err != nil {
return err
}
defer resp.Body.Close()
err = json.NewDecoder(resp.Body).Decode(decodeModelPtr)
if err != nil {
return err
}
return err
}

View File

@ -18,15 +18,9 @@ func NewClient(appConfig config.Interface, globalLogger logrus.FieldLogger, cred
return CignaClient{
baseClient,
}, err
}
func (c CignaClient) SyncAll() error {
patient, err := c.GetPatient(c.Credential.PatientId)
if err != nil {
return err
}
c.Logger.Infof("patient: %v", patient)
bundle, err := c.GetPatientEverything(c.Credential.PatientId)
if err != nil {
@ -37,14 +31,6 @@ func (c CignaClient) SyncAll() error {
if err != nil {
return err
}
c.Logger.Infof("bundle lenght: ", string(bundleJson))
c.Logger.Infof("bundle lenght: %v", string(bundleJson))
return nil
}
//func (c CignaClient) PatientProfile() (models.PatientProfile, error) {
// patient, err := c.GetPatientEverything(fmt.Sprintf("Patient/%s/", c.Credential.PatientId))
//
//
//
// return nil
//}