From aab3a04d0c4ddbf97d589ba9048a539c6d7186e9 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Thu, 25 Jun 2020 23:18:17 +0200 Subject: bug: harmonize how time are used, fix some issues in command special formats This assume that the convertion from time.Time <--> Unix timestamp is lossless which seems to be. --- bug/operation.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'bug/operation.go') diff --git a/bug/operation.go b/bug/operation.go index 20d44f6c..91df4ef2 100644 --- a/bug/operation.go +++ b/bug/operation.go @@ -36,8 +36,6 @@ type Operation interface { Id() entity.Id // Time return the time when the operation was added Time() time.Time - // GetUnixTime return the unix timestamp when the operation was added - GetUnixTime() int64 // GetFiles return the files needed by this operation GetFiles() []git.Hash // Apply the operation to a Snapshot to create the final state @@ -89,8 +87,9 @@ func idOperation(op Operation) entity.Id { type OpBase struct { OperationType OperationType `json:"type"` Author identity.Interface `json:"author"` - UnixTime int64 `json:"timestamp"` - Metadata map[string]string `json:"metadata,omitempty"` + // TODO: part of the data model upgrade, this should eventually be a timestamp + lamport + UnixTime int64 `json:"timestamp"` + Metadata map[string]string `json:"metadata,omitempty"` // Not serialized. Store the op's id in memory. id entity.Id // Not serialized. Store the extra metadata in memory, @@ -142,11 +141,6 @@ func (op *OpBase) Time() time.Time { return time.Unix(op.UnixTime, 0) } -// GetUnixTime return the unix timestamp when the operation was added -func (op *OpBase) GetUnixTime() int64 { - return op.UnixTime -} - // GetFiles return the files needed by this operation func (op *OpBase) GetFiles() []git.Hash { return nil @@ -158,7 +152,7 @@ func opBaseValidate(op Operation, opType OperationType) error { return fmt.Errorf("incorrect operation type (expected: %v, actual: %v)", opType, op.base().OperationType) } - if op.GetUnixTime() == 0 { + if op.Time().Unix() == 0 { return fmt.Errorf("time not set") } -- cgit