People: Refactor faces worker and related entities #22

internal/form/marker_test.go

@@ -9,21 +9,21 @@ import (
 func TestNewMarker(t *testing.T) {
 	t.Run("success", func(t *testing.T) {
 		var m = struct {
-			RefUID        string
-			RefSrc        string
-			MarkerSrc     string
 			MarkerType    string
+			MarkerSrc     string
+			MarkerName    string
+			SubjectUID    string
+			SubjectSrc    string
 			MarkerScore   int
 			MarkerInvalid bool
-			MarkerLabel   string
 		}{
-			RefUID:        "3h59wvth837b5vyiub35",
-			RefSrc:        "meta",
+			MarkerType:    "face",
 			MarkerSrc:     "image",
-			MarkerType:    "Face",
+			MarkerName:    "Foo",
+			SubjectUID:    "3h59wvth837b5vyiub35",
+			SubjectSrc:    "meta",
 			MarkerScore:   100,
 			MarkerInvalid: true,
-			MarkerLabel:   "Foo",
 		}
 
 		f, err := NewMarker(m)
@@ -32,12 +32,12 @@ func TestNewMarker(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		assert.Equal(t, "3h59wvth837b5vyiub35", f.RefUID)
-		assert.Equal(t, "meta", f.RefSrc)
+		assert.Equal(t, "face", f.MarkerType)
 		assert.Equal(t, "image", f.MarkerSrc)
-		assert.Equal(t, "Face", f.MarkerType)
+		assert.Equal(t, "Foo", f.MarkerName)
+		assert.Equal(t, "3h59wvth837b5vyiub35", f.SubjectUID)
+		assert.Equal(t, "meta", f.SubjectSrc)
 		assert.Equal(t, 100, f.MarkerScore)
 		assert.Equal(t, true, f.MarkerInvalid)
-		assert.Equal(t, "Foo", f.MarkerLabel)
 	})
 }