Merge pull request #9 from LF-Engineering/unicron-update-to-new-schema

Update to new schema

Author: lukaszgryglicki

cmd/git/git.go

@@ -1093,11 +1093,16 @@ func (j *DSGit) GetModelData(ctx *shared.Ctx, docs []interface{}) []insights.Com
 		commit.ParentSHAs, _ = doc["parents"].([]string)
 		commit.AuthoredTimestamp, _ = doc["author_date"].(time.Time)
 		authoredDt, _ := doc["utc_author"].(time.Time)
-		id, err := repository.GenerateRepositoryID(commit.Source, commit.RepositoryURL, "")
+		repoID, err := repository.GenerateRepositoryID(commit.Source, commit.RepositoryURL, "")
 		if err != nil {
 			shared.Printf("GenerateRepositoryID %+v", err)
 		}
-		commit.RepositoryID = id
+		commit.RepositoryID = repoID
+		commitID, err := insights.GenerateCommitID(repoID, commit.SHA)
+		if err != nil {
+			shared.Printf("GenerateCommitID %+v", err)
+		}
+		commit.ID = commitID
 		commit.RepositoryURL, _ = doc["origin"].(string)
 		commit.CommittedTimestamp, _ = doc["commit_date"].(time.Time)
 		createdOn := authoredDt
@@ -1110,15 +1115,20 @@ func (j *DSGit) GetModelData(ctx *shared.Ctx, docs []interface{}) []insights.Com
 				commitRole := insights.Contributor{}
 				ident := identsAry[i]
 				identType := identTypesAry[i]
-				commitRole.Role = identType
+				commitRole.Role = insights.Role(identType)
 				commitRole.Weight = 1.0
 				name := ident[0]
 				username := ""
 				email := ident[2]
 				name, username = shared.PostprocessNameUsername(name, username, email)
+				userID, err := user.GenerateIdentity(&commit.Source, &email, &name, &username)
+				if err != nil {
+					shared.Printf("GenerateIdentity %+v", err)
+				}
 				commitRole.Identity = user.UserIdentityObjectBase{
+					ID:         userID,
 					Email:      email,
-					FirstName:  name,
+					Name:       name,
 					IsVerified: false,
 					Username:   username,
 					Source:     commit.Source,

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/LF-Engineering/insights-datasource-shared v1.1.2
-	github.com/LF-Engineering/lfx-event-schema v0.0.0-20220104115800-c9beab510219
+	github.com/LF-Engineering/lfx-event-schema v0.1.0
 	github.com/aws/aws-lambda-go v1.27.1
 	github.com/aws/aws-sdk-go v1.42.25
 	github.com/json-iterator/go v1.1.11

go.sum

@@ -3,6 +3,8 @@ github.com/LF-Engineering/insights-datasource-shared v1.1.2 h1:Qshsnv+czWrOa05Bk
 github.com/LF-Engineering/insights-datasource-shared v1.1.2/go.mod h1:UnhIW7bkbrVFuons0pWx6BiyHhoQGEsM9W4LuGV2Lf0=
 github.com/LF-Engineering/lfx-event-schema v0.0.0-20220104115800-c9beab510219 h1:g6F91PfwEYTISAqOASH0Qor+sb4I+TuHQ/sl7JyBPyM=
 github.com/LF-Engineering/lfx-event-schema v0.0.0-20220104115800-c9beab510219/go.mod h1:GvEBmXvYGafFRIpZ6I0G5Ss4jsmkBNptLJIasLClXu8=
+github.com/LF-Engineering/lfx-event-schema v0.1.0 h1:xPAuzukY3ibV5syzINlxTqKaZ+xi8+aC1Erm1kTDpig=
+github.com/LF-Engineering/lfx-event-schema v0.1.0/go.mod h1:GvEBmXvYGafFRIpZ6I0G5Ss4jsmkBNptLJIasLClXu8=
 github.com/alecthomas/jsonschema v0.0.0-20210920000243-787cd8204a0d/go.mod h1:/n6+1/DWPltRLWL/VKyUxg6tzsl5kHUCcraimt4vr60=
 github.com/aws/aws-lambda-go v1.27.1 h1:MAH6hbrsktcSr/gGQKLvHeJPeoOoaspJqh+O4g05bpA=
 github.com/aws/aws-lambda-go v1.27.1/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=