add timestamp to vitals

savannahghi · Jul 28, 2023 · 26becb2 · 26becb2
1 parent 7dee98a
commit 26becb2
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 100 deletions.
diff --git a/pkg/clinical/application/dto/observation_output.go b/pkg/clinical/application/dto/observation_output.go
@@ -2,12 +2,13 @@ package dto
 
 // Observation is a minimal representation of a fhir Observation
 type Observation struct {
-	ID          string            `json:"id,omitempty"`
-	Name        string            `json:"name,omitempty"`
-	Value       string            `json:"value,omitempty"`
-	Status      ObservationStatus `json:"status,omitempty"`
-	PatientID   string            `json:"patientID,omitempty"`
-	EncounterID string            `json:"encounterID,omitempty"`
+	ID           string            `json:"id,omitempty"`
+	Name         string            `json:"name,omitempty"`
+	Value        string            `json:"value,omitempty"`
+	Status       ObservationStatus `json:"status,omitempty"`
+	PatientID    string            `json:"patientID,omitempty"`
+	EncounterID  string            `json:"encounterID,omitempty"`
+	TimeRecorded string            `json:"timeRecorded,omitempty"`
 }
 
 // ObservationEdge is an observation edge

diff --git a/pkg/clinical/infrastructure/datastore/cloudhealthcare/mock/fhir_mock.go b/pkg/clinical/infrastructure/datastore/cloudhealthcare/mock/fhir_mock.go
@@ -816,6 +816,7 @@ func NewFHIRMock() *FHIRMock {
 		},
 		MockCreateFHIRObservationFn: func(ctx context.Context, input domain.FHIRObservationInput) (*domain.FHIRObservation, error) {
 			uuid := uuid.New().String()
+			instant := gofakeit.TimeZone()
 			finalStatus := domain.ObservationStatusEnumFinal
 			return &domain.FHIRObservation{
 				ID:         new(string),
@@ -848,6 +849,7 @@ func NewFHIRMock() *FHIRMock {
 				EffectiveDateTime:    &scalarutils.Date{},
 				EffectivePeriod:      &domain.FHIRPeriod{},
 				EffectiveTiming:      &domain.FHIRTiming{},
+				EffectiveInstant:     (*scalarutils.Instant)(&instant),
 				Performer:            []*domain.FHIRReference{},
 				ValueQuantity:        &domain.FHIRQuantity{},
 				ValueCodeableConcept: (*scalarutils.Code)(&uuid),
@@ -1042,6 +1044,7 @@ func NewFHIRMock() *FHIRMock {
 		},
 		MockSearchPatientObservationsFn: func(ctx context.Context, patientReference, conceptID string, tenant dto.TenantIdentifiers, pagination dto.Pagination) (*domain.PagedFHIRObservations, error) {
 			uuid := uuid.New().String()
+			instant := gofakeit.TimeZone()
 			finalStatus := domain.ObservationStatusEnumFinal
 			return &domain.PagedFHIRObservations{
 				Observations: []domain.FHIRObservation{
@@ -1067,6 +1070,7 @@ func NewFHIRMock() *FHIRMock {
 							},
 							Text: "",
 						},
+						EffectiveInstant: (*scalarutils.Instant)(&instant),
 					},
 				},
 				HasNextPage:     true,

diff --git a/pkg/clinical/presentation/graph/generated/generated.go b/pkg/clinical/presentation/graph/generated/generated.go
diff --git a/pkg/clinical/presentation/graph/types.graphql b/pkg/clinical/presentation/graph/types.graphql
@@ -22,6 +22,7 @@ type Observation {
   encounterID: String!
   name: String!
   value: String!
+  timeRecorded: String!
 }
 
 type Medication {