diff --git a/pkg/server/api/console/v1/types/data_protection_impact_assessment.go b/pkg/server/api/console/v1/types/data_protection_impact_assessment.go index 4aae4ee34..0529807ea 100644 --- a/pkg/server/api/console/v1/types/data_protection_impact_assessment.go +++ b/pkg/server/api/console/v1/types/data_protection_impact_assessment.go @@ -64,7 +64,13 @@ func NewDataProtectionImpactAssessmentEdge(dpia *coredata.DataProtectionImpactAs func NewDataProtectionImpactAssessment(dpia *coredata.DataProtectionImpactAssessment) *DataProtectionImpactAssessment { return &DataProtectionImpactAssessment{ - ID: dpia.ID, + ID: dpia.ID, + ProcessingActivity: &ProcessingActivity{ + ID: dpia.ProcessingActivityID, + }, + Organization: &Organization{ + ID: dpia.OrganizationID, + }, Description: dpia.Description, NecessityAndProportionality: dpia.NecessityAndProportionality, PotentialRisk: dpia.PotentialRisk, @@ -74,4 +80,3 @@ func NewDataProtectionImpactAssessment(dpia *coredata.DataProtectionImpactAssess UpdatedAt: dpia.UpdatedAt, } } - diff --git a/pkg/server/api/console/v1/types/processing_activity.go b/pkg/server/api/console/v1/types/processing_activity.go index 8a27a9ce9..6b15661fa 100644 --- a/pkg/server/api/console/v1/types/processing_activity.go +++ b/pkg/server/api/console/v1/types/processing_activity.go @@ -63,7 +63,7 @@ func NewProcessingActivityEdge(par *coredata.ProcessingActivity, orderField core } func NewProcessingActivity(par *coredata.ProcessingActivity) *ProcessingActivity { - return &ProcessingActivity{ + object := &ProcessingActivity{ ID: par.ID, Organization: &Organization{ ID: par.OrganizationID, @@ -91,4 +91,12 @@ func NewProcessingActivity(par *coredata.ProcessingActivity) *ProcessingActivity CreatedAt: par.CreatedAt, UpdatedAt: par.UpdatedAt, } + + if par.DataProtectionOfficerID != nil { + object.DataProtectionOfficer = &People{ + ID: *par.DataProtectionOfficerID, + } + } + + return object }