Skip to content
This repository was archived by the owner on May 24, 2024. It is now read-only.

Commit a3b4422

Browse files
Add commit local time (#66)
* add commit local time Signed-off-by: Ayman <[email protected]> * clean up Signed-off-by: Ayman <[email protected]> Signed-off-by: Ayman <[email protected]> Signed-off-by: khalifapro <[email protected]> Co-authored-by: Ayman <[email protected]>
1 parent d779941 commit a3b4422

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

cmd/git/git.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,13 @@ func (j *DSGit) EnrichItem(ctx *shared.Ctx, item map[string]interface{}) (rich m
946946
err = fmt.Errorf("cannot parse author date from %v", iAuthorDate)
947947
return
948948
}
949+
950+
authorLocation := time.FixedZone(fmt.Sprintf("UTC%v", authorTz), int(authorTz)*60*60)
951+
authorLocalDate := time.Date(authorDate.Year(), authorDate.Month(), authorDate.Day(), authorDate.Hour(), authorDate.Minute(), authorDate.Second(), authorDate.Nanosecond(), authorLocation)
949952
rich["orphaned"] = false
950953
rich["tz"] = authorTz
951954
rich["author_date"] = authorDateTz
955+
rich["author_local_date"] = authorLocalDate.Format(time.RFC3339)
952956
rich["author_date_weekday"] = int(authorDateTz.Weekday())
953957
rich["author_date_hour"] = authorDateTz.Hour()
954958
rich["utc_author"] = authorDate
@@ -961,8 +965,12 @@ func (j *DSGit) EnrichItem(ctx *shared.Ctx, item map[string]interface{}) (rich m
961965
err = fmt.Errorf("cannot parse commit date from %v", iAuthorDate)
962966
return
963967
}
968+
969+
committerLocation := time.FixedZone(fmt.Sprintf("UTC%v", commitTz), int(commitTz)*60*60)
970+
committerLocationDate := time.Date(commitDate.Year(), commitDate.Month(), commitDate.Day(), commitDate.Hour(), commitDate.Minute(), commitDate.Second(), commitDate.Nanosecond(), committerLocation)
964971
rich["commit_tz"] = commitTz
965972
rich["commit_date"] = commitDateTz
973+
rich["commit_local_date"] = committerLocationDate.Format(time.RFC3339)
966974
rich["commit_date_weekday"] = int(commitDateTz.Weekday())
967975
rich["commit_date_hour"] = commitDateTz.Hour()
968976
rich["utc_commit"] = commitDate
@@ -1243,6 +1251,7 @@ func (j *DSGit) GetModelData(ctx *shared.Ctx, docs []interface{}) []git.CommitCr
12431251
_, commit.Orphaned = j.OrphanedMap[commit.SHA]
12441252
commit.ParentSHAs, _ = doc["parents"].([]string)
12451253
commit.AuthoredTimestamp, _ = doc["author_date"].(time.Time)
1254+
commit.AuthoredLocalTimestamp, _ = doc["author_local_date"].(string)
12461255
authoredDt, _ := doc["utc_author"].(time.Time)
12471256
commit.RepositoryURL, _ = doc["origin"].(string)
12481257
commit.RepositoryID = repoID
@@ -1252,6 +1261,7 @@ func (j *DSGit) GetModelData(ctx *shared.Ctx, docs []interface{}) []git.CommitCr
12521261
}
12531262
commit.ID = commitID
12541263
commit.CommittedTimestamp, _ = doc["commit_date"].(time.Time)
1264+
commit.CommittedLocalTimestamp, _ = doc["commit_local_date"].(string)
12551265
createdOn := authoredDt
12561266
commit.SyncTimestamp = time.Now()
12571267
commitRoles := []insights.Contributor{}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.17
44

55
require (
66
github.com/LF-Engineering/insights-datasource-shared v1.5.21
7-
github.com/LF-Engineering/lfx-event-schema v0.1.33
7+
github.com/LF-Engineering/lfx-event-schema v0.1.34-0.20221216232638-f07e3eda14cb
88
github.com/aws/aws-lambda-go v1.27.1
99
github.com/aws/aws-sdk-go v1.42.25
1010
github.com/json-iterator/go v1.1.11

go.sum

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ github.com/DataDog/datadog-go/v5 v5.0.2 h1:UFtEe7662/Qojxkw1d6SboAeA0CPI3naKhVAS
77
github.com/DataDog/datadog-go/v5 v5.0.2/go.mod h1:ZI9JFB4ewXbw1sBnF4sxsR2k1H3xjV+PUAOUsHvKpcU=
88
github.com/DataDog/sketches-go v1.2.1 h1:qTBzWLnZ3kM2kw39ymh6rMcnN+5VULwFs++lEYUUsro=
99
github.com/DataDog/sketches-go v1.2.1/go.mod h1:1xYmPLY1So10AwxV6MJV0J53XVH+WL9Ad1KetxVivVI=
10-
github.com/LF-Engineering/insights-datasource-shared v1.5.18-0.20221031155159-425447b99760 h1:mz4lyh+rx+HjDatpc8gc1viGaN2snN8OkGpu2igYTDg=
11-
github.com/LF-Engineering/insights-datasource-shared v1.5.18-0.20221031155159-425447b99760/go.mod h1:9DmFQbC8nnm1C7k+/tDo3Rmqzzx7AzmhPBlFouXaBZ8=
1210
github.com/LF-Engineering/insights-datasource-shared v1.5.21 h1:cZHytRoA5pZHsQlpeasV5K2b2jZ66ikylvNvzlBSj9s=
1311
github.com/LF-Engineering/insights-datasource-shared v1.5.21/go.mod h1:9DmFQbC8nnm1C7k+/tDo3Rmqzzx7AzmhPBlFouXaBZ8=
1412
github.com/LF-Engineering/lfx-event-schema v0.1.14/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=
15-
github.com/LF-Engineering/lfx-event-schema v0.1.33 h1:5Yk20tPkPbyOKEckcEF87qEQtl1H8l6TyA9wjKi+cl0=
16-
github.com/LF-Engineering/lfx-event-schema v0.1.33/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=
17-
github.com/LF-Engineering/lfx-event-schema v0.1.34/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=
13+
github.com/LF-Engineering/lfx-event-schema v0.1.34-0.20221216232638-f07e3eda14cb h1:zoB4nC9NRYkopoWGhNoiqWYU9/B1QoZaTfM0P3nSIqM=
14+
github.com/LF-Engineering/lfx-event-schema v0.1.34-0.20221216232638-f07e3eda14cb/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=
1815
github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
1916
github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
2017
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=

0 commit comments

Comments
 (0)