Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #583 Show latest published data attributes #585

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Fix #583 Show latest published data attributes #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 44 additions & 21 deletions internal/handler/v2/config/dataattribute/config_list_dataattributes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,16 @@ func dataAttributesToInterfaceSlice(dataAttributes []dataAttributeForLists) []in
return interfaceSlice
}

func returnHTTPResponse(resp interface{}, w http.ResponseWriter) {
response, _ := json.Marshal(resp)
w.Header().Set(config.ContentTypeHeader, config.ContentTypeJSON)
w.WriteHeader(http.StatusOK)
w.Write(response)
func recreateDataAgreementFromObjectData(objectData string) (dataagreement.DataAgreement, error) {

// Deserialise data agreement
var da dataagreement.DataAgreement
err := json.Unmarshal([]byte(objectData), &da)
if err != nil {
return da, err
}

return da, nil
}

type dataAgreementForDataAttribute struct {
Expand Down Expand Up @@ -137,31 +142,49 @@ func ConfigListDataAttributes(w http.ResponseWriter, r *http.Request) {

if err != nil && errors.Is(err, RevisionIDIsMissingError) {

// Return all data agreements
dataAgreements, err := dataagreement.GetAllDataAgreementsWithLatestRevisionsObjectData(organisationId)
if err != nil {
m := "Failed to fetch data agreements"
common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
return
}

methodOfUse, err := ParseMethodOfUseDataAttributesQueryParams(r)
methodOfUse = common.Sanitize(methodOfUse)
var res []dataagreement.DataAgreement

var tempDataAgreements []dataagreement.DataAgreement
if err != nil && errors.Is(err, MethodOfUseIsMissingError) {

// Return all data attributes
res, err = darepo.GetAll()
if err != nil {
m := fmt.Sprintf("Failed to fetch data attribute by method of use: %v", methodOfUse)
common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
return
for _, dataAgreement := range dataAgreements {
if len(dataAgreement.ObjectData) >= 1 {
tempDataAgreement, err := recreateDataAgreementFromObjectData(dataAgreement.ObjectData)
if err != nil {
m := "Failed to receate data agreement"
common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
return
}
tempDataAgreements = append(tempDataAgreements, tempDataAgreement)
}
}

} else {
// List by method of use
res, err = darepo.GetByMethodOfUse(methodOfUse)
if err != nil {
m := fmt.Sprintf("Failed to fetch data attribute by method of use: %v", methodOfUse)
common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
return
for _, dataAgreement := range dataAgreements {
if len(dataAgreement.ObjectData) >= 1 {
tempDataAgreement, err := recreateDataAgreementFromObjectData(dataAgreement.ObjectData)
if err != nil {
m := "Failed to receate data agreement"
common.HandleErrorV2(w, http.StatusInternalServerError, m, err)
return
}
if tempDataAgreement.MethodOfUse == methodOfUse {
tempDataAgreements = append(tempDataAgreements, tempDataAgreement)
}
}
}

}
dataAttributes := dataAttributesForList(res)
dataAttributes := dataAttributesForList(tempDataAgreements)

query := paginate.PaginateObjectsQuery{
Limit: limit,
Expand All @@ -173,7 +196,7 @@ func ConfigListDataAttributes(w http.ResponseWriter, r *http.Request) {
DataAttributes: result.Items,
Pagination: result.Pagination,
}
returnHTTPResponse(resp, w)
common.ReturnHTTPResponse(resp, w)
return

} else {
Expand Down Expand Up @@ -224,5 +247,5 @@ func ConfigListDataAttributes(w http.ResponseWriter, r *http.Request) {

}

returnHTTPResponse(resp, w)
common.ReturnHTTPResponse(resp, w)
}