Merge pull request #270 from kthcloud/dev

add many timestamps to reads, minor bug fix with resource transfers
kthcloud · Nov 15, 2023 · ea0d373 · ea0d373
2 parents c3421a1 + 266346d
commit ea0d373
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 46 deletions.
diff --git a/models/dto/body/deployment.go b/models/dto/body/deployment.go
@@ -79,11 +79,15 @@ type DeploymentUpdated struct {
 }
 
 type DeploymentRead struct {
-	ID      string `json:"id"`
-	Name    string `json:"name"`
-	Type    string `json:"type"`
-	OwnerID string `json:"ownerId"`
-	Zone    string `json:"zone"`
+	ID          string     `json:"id"`
+	Name        string     `json:"name"`
+	Type        string     `json:"type"`
+	OwnerID     string     `json:"ownerId"`
+	Zone        string     `json:"zone"`
+	CreatedAt   time.Time  `json:"createdAt"`
+	UpdatedAt   *time.Time `json:"updatedAt,omitempty"`
+	RepairedAt  *time.Time `json:"repairedAt,omitempty"`
+	RestartedAt *time.Time `json:"restartedAt,omitempty"`
 
 	URL             *string  `json:"url,omitempty"`
 	CustomDomainURL *string  `json:"customDomainUrl,omitempty"`

diff --git a/models/dto/body/job.go b/models/dto/body/job.go
@@ -1,11 +1,17 @@
 package body
 
+import "time"
+
 type JobRead struct {
-	ID        string  `json:"id"`
-	UserID    string  `json:"userId"`
-	Type      string  `json:"type"`
-	Status    string  `json:"status"`
-	LastError *string `json:"lastError,omitempty"`
+	ID         string     `json:"id"`
+	UserID     string     `json:"userId"`
+	Type       string     `json:"type"`
+	Status     string     `json:"status"`
+	LastError  *string    `json:"lastError,omitempty"`
+	CreatedAt  time.Time  `json:"createdAt"`
+	LastRunAt  *time.Time `json:"lastRunAt,omitempty"`
+	FinishedAt *time.Time `json:"finishedAt,omitempty"`
+	RunAfter   time.Time  `json:"runAfter,omitempty"`
 }
 
 type JobUpdate struct {

diff --git a/models/dto/body/notification.go b/models/dto/body/notification.go
@@ -3,10 +3,11 @@ package body
 import "time"
 
 type NotificationRead struct {
-	ID      string                 `json:"id"`
-	Type    string                 `json:"type"`
-	Content map[string]interface{} `json:"content"`
-	ReadAt  *time.Time             `json:"readAt,omitempty"`
+	ID        string                 `json:"id"`
+	Type      string                 `json:"type"`
+	Content   map[string]interface{} `json:"content"`
+	CreatedAt time.Time              `json:"createdAt"`
+	ReadAt    *time.Time             `json:"readAt,omitempty"`
 }
 
 type NotificationUpdate struct {

diff --git a/models/dto/body/team.go b/models/dto/body/team.go
@@ -55,4 +55,6 @@ type TeamRead struct {
 	Description *string        `json:"description,omitempty"`
 	Resources   []TeamResource `json:"resources"`
 	Members     []TeamMember   `json:"members"`
+	CreatedAt   time.Time      `json:"createdAt"`
+	UpdatedAt   *time.Time     `json:"updatedAt,omitempty"`
 }
diff --git a/models/dto/body/vm.go b/models/dto/body/vm.go
@@ -3,10 +3,13 @@ package body
 import "time"
 
 type VmRead struct {
-	ID      string `json:"id"`
-	Name    string `json:"name"`
-	OwnerID string `json:"ownerId"`
-	Zone    string `json:"zone"`
+	ID         string     `json:"id"`
+	Name       string     `json:"name"`
+	OwnerID    string     `json:"ownerId"`
+	Zone       string     `json:"zone"`
+	CreatedAt  time.Time  `json:"createdAt"`
+	UpdatedAt  *time.Time `json:"updatedAt,omitempty"`
+	RepairedAt *time.Time `json:"repairedAt,omitempty"`
 
 	Specs        Specs  `json:"specs,omitempty"`
 	Ports        []Port `json:"ports"`

diff --git a/models/sys/deployment/deployment.go b/models/sys/deployment/deployment.go
@@ -27,7 +27,7 @@ type Deployment struct {
 	StatusMessage string `bson:"statusMessage"`
 	StatusCode    int    `bson:"statusCode"`
 
-	Transfer *Transfer `bson:"transfer"`
+	Transfer *Transfer `bson:"transfer,omitempty"`
 }
 
 func (deployment *Deployment) GetMainApp() *App {

diff --git a/models/sys/deployment/dto.go b/models/sys/deployment/dto.go
@@ -63,11 +63,15 @@ func (deployment *Deployment) ToDTO(storageManagerURL *string) body.DeploymentRe
 	}
 
 	return body.DeploymentRead{
-		ID:      deployment.ID,
-		Name:    deployment.Name,
-		Type:    deployment.Type,
-		OwnerID: deployment.OwnerID,
-		Zone:    deployment.Zone,
+		ID:          deployment.ID,
+		Name:        deployment.Name,
+		Type:        deployment.Type,
+		OwnerID:     deployment.OwnerID,
+		Zone:        deployment.Zone,
+		CreatedAt:   deployment.CreatedAt,
+		UpdatedAt:   utils.NonZeroOrNil(deployment.UpdatedAt),
+		RepairedAt:  utils.NonZeroOrNil(deployment.RepairedAt),
+		RestartedAt: utils.NonZeroOrNil(deployment.RestartedAt),
 
 		URL:             deployment.GetURL(),
 		CustomDomainURL: deployment.GetCustomDomainURL(),
@@ -78,13 +82,10 @@ func (deployment *Deployment) ToDTO(storageManagerURL *string) body.DeploymentRe
 		InternalPort:    app.InternalPort,
 		Image:           image,
 		HealthCheckPath: &app.PingPath,
-
-		Status:     deployment.StatusMessage,
-		PingResult: pingResult,
-
-		Integrations: integrations,
-
-		StorageURL: storageManagerURL,
+		Status:          deployment.StatusMessage,
+		PingResult:      pingResult,
+		Integrations:    integrations,
+		StorageURL:      storageManagerURL,
 	}
 }
 

diff --git a/models/sys/job/dto.go b/models/sys/job/dto.go
@@ -1,6 +1,9 @@
 package job
 
-import "go-deploy/models/dto/body"
+import (
+	"go-deploy/models/dto/body"
+	"go-deploy/utils"
+)
 
 func (job *Job) ToDTO(statusMessage string) body.JobRead {
 	var lastError *string
@@ -9,11 +12,15 @@ func (job *Job) ToDTO(statusMessage string) body.JobRead {
 	}
 
 	return body.JobRead{
-		ID:        job.ID,
-		UserID:    job.UserID,
-		Type:      job.Type,
-		Status:    statusMessage,
-		LastError: lastError,
+		ID:         job.ID,
+		UserID:     job.UserID,
+		Type:       job.Type,
+		Status:     statusMessage,
+		LastError:  lastError,
+		CreatedAt:  job.CreatedAt,
+		LastRunAt:  utils.NonZeroOrNil(job.LastRunAt),
+		FinishedAt: utils.NonZeroOrNil(job.FinishedAt),
+		RunAfter:   job.RunAfter,
 	}
 }
 

diff --git a/models/sys/notification/dto.go b/models/sys/notification/dto.go
@@ -4,9 +4,10 @@ import "go-deploy/models/dto/body"
 
 func (notification *Notification) ToDTO() body.NotificationRead {
 	return body.NotificationRead{
-		ID:      notification.ID,
-		Type:    notification.Type,
-		Content: notification.Content,
-		ReadAt:  notification.ReadAt,
+		ID:        notification.ID,
+		Type:      notification.Type,
+		Content:   notification.Content,
+		CreatedAt: notification.CreatedAt,
+		ReadAt:    notification.ReadAt,
 	}
 }
diff --git a/models/sys/team/db.go b/models/sys/team/db.go
@@ -84,3 +84,7 @@ func (client *Client) UpdateMember(id string, memberID string, member *Member) e
 
 	return client.SetWithBsonByID(id, updateData)
 }
+
+func (client *Client) MarkUpdated(id string) error {
+	return client.SetWithBsonByID(id, bson.D{{"updatedAt", time.Now()}})
+}
diff --git a/models/sys/team/dto.go b/models/sys/team/dto.go
@@ -2,6 +2,7 @@ package team
 
 import (
 	"go-deploy/models/dto/body"
+	"go-deploy/utils"
 )
 
 func (t *Team) ToDTO(getMember func(*Member) *body.TeamMember, getResourceName func(*Resource) *string) body.TeamRead {
@@ -31,6 +32,8 @@ func (t *Team) ToDTO(getMember func(*Member) *body.TeamMember, getResourceName f
 		Description: t.Description,
 		Resources:   resources,
 		Members:     members,
+		CreatedAt:   t.CreatedAt,
+		UpdatedAt:   utils.NonZeroOrNil(t.UpdatedAt),
 	}
 }
 

diff --git a/models/sys/team/team.go b/models/sys/team/team.go
@@ -35,6 +35,7 @@ type Team struct {
 	Description *string   `bson:"description"`
 	OwnerID     string    `bson:"ownerId"`
 	CreatedAt   time.Time `bson:"createdAt"`
+	UpdatedAt   time.Time `bson:"updatedAt"`
 
 	ResourceMap map[string]Resource `bson:"resourceMap"`
 	MemberMap   map[string]Member   `bson:"memberMap"`

diff --git a/models/sys/vm/dto.go b/models/sys/vm/dto.go
@@ -3,6 +3,7 @@ package vm
 import (
 	"go-deploy/models/dto/body"
 	"go-deploy/service"
+	"go-deploy/utils"
 )
 
 func (vm *VM) ToDTO(status string, connectionString *string, gpu *body.GpuRead, externalPortMapper map[string]int) body.VmRead {
@@ -70,10 +71,13 @@ func (vm *VM) ToDTO(status string, connectionString *string, gpu *body.GpuRead,
 	}
 
 	return body.VmRead{
-		ID:      vm.ID,
-		Name:    vm.Name,
-		OwnerID: vm.OwnerID,
-		Zone:    vm.Zone,
+		ID:         vm.ID,
+		Name:       vm.Name,
+		OwnerID:    vm.OwnerID,
+		Zone:       vm.Zone,
+		CreatedAt:  vm.CreatedAt,
+		UpdatedAt:  utils.NonZeroOrNil(vm.UpdatedAt),
+		RepairedAt: utils.NonZeroOrNil(vm.RepairedAt),
 		Specs: body.Specs{
 			CpuCores: vm.Specs.CpuCores,
 			RAM:      vm.Specs.RAM,

diff --git a/models/sys/vm/vm.go b/models/sys/vm/vm.go
@@ -32,7 +32,7 @@ type VM struct {
 	StatusCode    int    `bson:"statusCode"`
 	StatusMessage string `bson:"statusMessage"`
 
-	Transfer *Transfer `bson:"transfer"`
+	Transfer *Transfer `bson:"transfer,omitempty"`
 }
 
 type Specs struct {

diff --git a/service/user_service/team_service.go b/service/user_service/team_service.go
@@ -245,6 +245,11 @@ func UpdateTeamAuth(id string, dtoUpdateTeam *body.TeamUpdate, auth *service.Aut
 		return nil, TeamNotFoundErr
 	}
 
+	err = teamClient.MarkUpdated(id)
+	if err != nil {
+		return nil, err
+	}
+
 	return afterUpdate, nil
 }
 

diff --git a/utils/utils.go b/utils/utils.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 )
 
 func HashString(token string) string {
@@ -84,3 +85,11 @@ func PrettyPrintError(err error) {
 func EmptyValue(s *string) bool {
 	return s != nil && *s == ""
 }
+
+func NonZeroOrNil(t time.Time) *time.Time {
+	if t.IsZero() {
+		return nil
+	}
+
+	return &t
+}