-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from ahilwers/29-create-a-resource-for-a-sync-…
…service 29 create a resource for a sync service
- Loading branch information
Showing
16 changed files
with
1,357 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package database | ||
|
|
||
| import ( | ||
| "time" | ||
| "timeasy-server/pkg/domain/model" | ||
| "timeasy-server/pkg/domain/repository" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| "gorm.io/gorm" | ||
| ) | ||
|
|
||
| type gormSyncRepository struct { | ||
| db *gorm.DB | ||
| } | ||
|
|
||
| func NewGormSyncRepository(database *gorm.DB) repository.SyncRepository { | ||
| return &gormSyncRepository{ | ||
| db: database, | ||
| } | ||
| } | ||
|
|
||
| func (repo *gormSyncRepository) UpdateAndDeleteData(data model.SyncData) error { | ||
| return repo.db.Transaction(func(tx *gorm.DB) error { | ||
| err := repo.updateAndDeleteProjects(tx, data) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = repo.updateAndDeleteTimeEntries(tx, data) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
|
||
| func (repo *gormSyncRepository) updateAndDeleteProjects(tx *gorm.DB, data model.SyncData) error { | ||
| for _, project := range data.ProjectsToBeUpdated { | ||
| if err := tx.Save(&project).Error; err != nil { | ||
| return err | ||
| } | ||
| } | ||
| for _, project := range data.ProjectsToBeDeleted { | ||
| if err := tx.Delete(&project).Error; err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (repo *gormSyncRepository) updateAndDeleteTimeEntries(tx *gorm.DB, data model.SyncData) error { | ||
| for _, timeEntry := range data.TimeEntriesToBeUpdated { | ||
| if err := tx.Save(&timeEntry).Error; err != nil { | ||
| return err | ||
| } | ||
| } | ||
| for _, timeEntry := range data.TimeEntriesToBeDeleted { | ||
| if err := tx.Delete(&timeEntry).Error; err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (repo *gormSyncRepository) GetUpdatedTimeEntriesOfUser(userId uuid.UUID, sinceWhen time.Time) ([]model.TimeEntry, error) { | ||
| var updatedEntries []model.TimeEntry | ||
| if err := repo.db.Unscoped().Order("start_time desc").Order("end_time desc").Find(&updatedEntries, "user_id=? AND (updated_at >= ? OR created_at >= ? OR deleted_at >= ?)", userId, sinceWhen, sinceWhen, sinceWhen).Error; err != nil { | ||
| return nil, err | ||
| } | ||
| return updatedEntries, nil | ||
| } | ||
|
|
||
| func (repo *gormSyncRepository) GetUpdatedProjectsOfUser(userId uuid.UUID, sinceWhen time.Time) ([]model.Project, error) { | ||
| var updatedProjects []model.Project | ||
| if err := repo.db.Unscoped().Order("name").Find(&updatedProjects, "user_id=? AND (updated_at >= ? OR created_at >= ? OR deleted_at >= ?)", userId, sinceWhen, sinceWhen, sinceWhen).Error; err != nil { | ||
| return nil, err | ||
| } | ||
| return updatedProjects, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package model | ||
|
|
||
| type SyncData struct { | ||
| TimeEntriesToBeUpdated []TimeEntry | ||
| TimeEntriesToBeDeleted []TimeEntry | ||
| ProjectsToBeUpdated []Project | ||
| ProjectsToBeDeleted []Project | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package repository | ||
|
|
||
| import ( | ||
| "time" | ||
| "timeasy-server/pkg/domain/model" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| ) | ||
|
|
||
| type SyncRepository interface { | ||
| UpdateAndDeleteData(data model.SyncData) error | ||
| GetUpdatedTimeEntriesOfUser(userId uuid.UUID, sinceWhen time.Time) ([]model.TimeEntry, error) | ||
| GetUpdatedProjectsOfUser(userId uuid.UUID, sinceWhen time.Time) ([]model.Project, error) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package rest | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| ) | ||
|
|
||
| type ChangeType uint8 | ||
|
|
||
| const ( | ||
| NEW ChangeType = iota | ||
| CHANGED | ||
| DELETED | ||
| ) | ||
|
|
||
| var ( | ||
| ChangeType_Name = map[uint8]string{ | ||
| 0: "NEW", | ||
| 1: "CHANGED", | ||
| 2: "DELETED", | ||
| } | ||
|
|
||
| ChangeType_Value = map[string]uint8{ | ||
| "NEW": 0, | ||
| "CHANGED": 1, | ||
| "DELETED": 2, | ||
| } | ||
| ) | ||
|
|
||
| func (c ChangeType) String() string { | ||
| return ChangeType_Name[uint8(c)] | ||
| } | ||
|
|
||
| func (c ChangeType) MarshalJSON() ([]byte, error) { | ||
| return json.Marshal(c.String()) | ||
| } | ||
|
|
||
| func (c *ChangeType) UnmarshalJSON(data []byte) (err error) { | ||
| var sType string | ||
| if err := json.Unmarshal(data, &sType); err != nil { | ||
| return err | ||
| } | ||
| if *c, err = c.parse(sType); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *ChangeType) parse(sType string) (ChangeType, error) { | ||
| sType = strings.TrimSpace(strings.ToUpper(sType)) | ||
| value, ok := ChangeType_Value[sType] | ||
| if !ok { | ||
| return ChangeType(0), fmt.Errorf("%v is not a valid change type", sType) | ||
| } | ||
| return ChangeType(value), nil | ||
| } | ||
|
|
||
| type SyncEntries struct { | ||
| TimeEntries []ChangedTimeEntryDto | ||
| Projects []ChangedProjectDto | ||
| } | ||
|
|
||
| type ChangedTimeEntryDto struct { | ||
| Id uuid.UUID | ||
| Description string `json:"description" binding:"required"` | ||
| StartTimeUTCUnix int64 `json:"startTimeUTCUnix" binding:"required"` | ||
| EndTimeUTCUnix int64 | ||
| ProjectId uuid.UUID `json:"projectId" binding:"required"` | ||
| ChangeType ChangeType `json:"changeType" binding:"required"` | ||
| ChangeTimestampUTCUnix int64 `json:"changeTimestampUTCUnix" binding:"required"` | ||
| } | ||
|
|
||
| type ChangedProjectDto struct { | ||
| Id uuid.UUID | ||
| Name string `json:"name" binding:"required"` | ||
| ChangeType ChangeType `json:"changeType" binding:"required"` | ||
| ChangeTimestampUTCUnix int64 `json:"changeTimestampUTCUnix" binding:"required"` | ||
| } |
Oops, something went wrong.