Ensure evidence backmatter functions correctly (#264)

* Ensure evidence backmatter functions correctly

* Update docs

Author: Chris Vermeulen

docs/docs.go

@@ -15247,7 +15247,7 @@ const docTemplate = `{
                         "$ref": "#/definitions/handler.EvidenceActivity"
                     }
                 },
-                "backMatter": {
+                "back-matter": {
                     "$ref": "#/definitions/oscalTypes_1_1_3.BackMatter"
                 },
                 "components": {
@@ -16758,7 +16758,7 @@ const docTemplate = `{
                     }
                 },
                 "back-matter": {
-                    "$ref": "#/definitions/relational.BackMatter"
+                    "$ref": "#/definitions/oscalTypes_1_1_3.BackMatter"
                 },
                 "components": {
                     "type": "array",

docs/swagger.json

@@ -15241,7 +15241,7 @@
                         "$ref": "#/definitions/handler.EvidenceActivity"
                     }
                 },
-                "backMatter": {
+                "back-matter": {
                     "$ref": "#/definitions/oscalTypes_1_1_3.BackMatter"
                 },
                 "components": {
@@ -16752,7 +16752,7 @@
                     }
                 },
                 "back-matter": {
-                    "$ref": "#/definitions/relational.BackMatter"
+                    "$ref": "#/definitions/oscalTypes_1_1_3.BackMatter"
                 },
                 "components": {
                     "type": "array",

docs/swagger.yaml

@@ -143,7 +143,7 @@ definitions:
         items:
           $ref: '#/definitions/handler.EvidenceActivity'
         type: array
-      backMatter:
+      back-matter:
         $ref: '#/definitions/oscalTypes_1_1_3.BackMatter'
       components:
         description: Which components of the subject are being observed. A tool, user,
@@ -1083,7 +1083,7 @@ definitions:
           $ref: '#/definitions/oscalTypes_1_1_3.Activity'
         type: array
       back-matter:
-        $ref: '#/definitions/relational.BackMatter'
+        $ref: '#/definitions/oscalTypes_1_1_3.BackMatter'
       components:
         items:
           $ref: '#/definitions/oscalTypes_1_1_3.SystemComponent'

internal/api/handler/evidence.go

@@ -142,7 +142,7 @@ type EvidenceCreateRequest struct {
 
 	Props      []oscalTypes_1_1_3.Property
 	Links      []oscalTypes_1_1_3.Link
-	BackMatter *oscalTypes_1_1_3.BackMatter
+	BackMatter *oscalTypes_1_1_3.BackMatter `json:"back-matter,omitempty"`
 
 	// Who or What is generating this evidence
 	Origins []oscalTypes_1_1_3.Origin
@@ -398,6 +398,7 @@ func (h *EvidenceHandler) Search(ctx echo.Context) error {
 
 type OscalLikeEvidence struct {
 	relational.Evidence
+	BackMatter     *oscalTypes_1_1_3.BackMatter         `json:"back-matter,omitempty"`
 	Props          []oscalTypes_1_1_3.Property          `json:"props"`
 	Links          []oscalTypes_1_1_3.Link              `json:"links"`
 	Origins        []oscalTypes_1_1_3.Origin            `json:"origins,omitempty"`
@@ -439,6 +440,10 @@ func (o *OscalLikeEvidence) FromEvidence(evidence *relational.Evidence) error {
 		}
 		return out
 	}()
+	o.BackMatter = &oscalTypes_1_1_3.BackMatter{}
+	if evidence.BackMatter != nil {
+		o.BackMatter = evidence.BackMatter.MarshalOscal()
+	}
 	o.Status = evidence.Status.Data()
 	return nil
 }
@@ -465,6 +470,8 @@ func (h *EvidenceHandler) Get(ctx echo.Context) error {
 	var evidence relational.Evidence
 	if err := h.db.
 		Preload("Labels").
+		Preload("BackMatter").
+		Preload("BackMatter.Resources").
 		Preload("Activities").
 		Preload("Activities.Steps").
 		Preload("InventoryItems").