fix bug cache does not be updated

kobtea · Feb 26, 2017 · 3e8123c · 3e8123c
1 parent 7c445a1
commit 3e8123c
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 42 deletions.
diff --git a/todoist/common.go b/todoist/common.go
@@ -4,6 +4,14 @@ import "fmt"
 
 type IntBool bool
 
+func (i IntBool) Bool() bool {
+	if i {
+		return true
+	} else {
+		return false
+	}
+}
+
 func (i IntBool) MarshalJSON() ([]byte, error) {
 	if i {
 		return []byte("1"), nil

diff --git a/todoist/filter.go b/todoist/filter.go
@@ -113,25 +113,29 @@ func (c *filterCache) resolve(id ID) *Filter {
 }
 
 func (c *filterCache) store(filter Filter) {
-	old := c.resolve(filter.ID)
-	if old == nil {
-		if !filter.IsDeleted {
-			*c.cache = append(*c.cache, filter)
-		}
-	} else {
-		if filter.IsDeleted {
-			c.remove(filter)
+	var res []Filter
+	isNew := true
+	for _, f := range *c.cache {
+		if f.Equal(filter) {
+			if !filter.IsDeleted {
+				res = append(res, filter)
+			}
+			isNew = false
 		} else {
-			old = &filter
+			res = append(res, f)
 		}
 	}
+	if isNew && !filter.IsDeleted.Bool() {
+		res = append(res, filter)
+	}
+	c.cache = &res
 }
 
 func (c *filterCache) remove(filter Filter) {
 	var res []Filter
-	for _, p := range *c.cache {
-		if !p.Equal(filter) {
-			res = append(res, p)
+	for _, f := range *c.cache {
+		if !f.Equal(filter) {
+			res = append(res, f)
 		}
 	}
 	c.cache = &res

diff --git a/todoist/item.go b/todoist/item.go
@@ -236,20 +236,24 @@ func (c *itemCache) resolve(id ID) *Item {
 }
 
 func (c *itemCache) store(item Item) {
-	old := c.resolve(item.ID)
 	// sync api do not returns deleted items.
 	// so remove deleted items from cache too.
-	if old == nil {
-		if !item.IsDeleted {
-			*c.cache = append(*c.cache, item)
-		}
-	} else {
-		if item.IsDeleted {
-			c.remove(item)
+	var res []Item
+	isNew := true
+	for _, i := range *c.cache {
+		if i.Equal(item) {
+			if !item.IsDeleted {
+				res = append(res, item)
+			}
+			isNew = false
 		} else {
-			old = &item
+			res = append(res, i)
 		}
 	}
+	if isNew && !item.IsDeleted.Bool() {
+		res = append(res, item)
+	}
+	c.cache = &res
 }
 
 func (c *itemCache) remove(item Item) {

diff --git a/todoist/label.go b/todoist/label.go
@@ -113,25 +113,29 @@ func (c *labelCache) resolve(id ID) *Label {
 }
 
 func (c *labelCache) store(label Label) {
-	old := c.resolve(label.ID)
-	if old == nil {
-		if !label.IsDeleted {
-			*c.cache = append(*c.cache, label)
-		}
-	} else {
-		if label.IsDeleted {
-			c.remove(label)
+	var res []Label
+	isNew := true
+	for _, l := range *c.cache {
+		if l.Equal(label) {
+			if !label.IsDeleted {
+				res = append(res, label)
+			}
+			isNew = false
 		} else {
-			old = &label
+			res = append(res, l)
 		}
 	}
+	if isNew && !label.IsDeleted.Bool() {
+		res = append(res, label)
+	}
+	c.cache = &res
 }
 
 func (c *labelCache) remove(label Label) {
 	var res []Label
-	for _, p := range *c.cache {
-		if !p.Equal(label) {
-			res = append(res, p)
+	for _, l := range *c.cache {
+		if !l.Equal(label) {
+			res = append(res, l)
 		}
 	}
 	c.cache = &res

diff --git a/todoist/project.go b/todoist/project.go
@@ -221,18 +221,22 @@ func (c *projectCache) resolve(id ID) *Project {
 }
 
 func (c *projectCache) store(project Project) {
-	old := c.resolve(project.ID)
-	if old == nil {
-		if !project.IsDeleted {
-			*c.cache = append(*c.cache, project)
-		}
-	} else {
-		if project.IsDeleted {
-			c.remove(project)
+	var res []Project
+	isNew := true
+	for _, p := range *c.cache {
+		if p.Equal(project) {
+			if !project.IsDeleted {
+				res = append(res, project)
+			}
+			isNew = false
 		} else {
-			old = &project
+			res = append(res, p)
 		}
 	}
+	if isNew && !project.IsDeleted.Bool() {
+		res = append(res, project)
+	}
+	c.cache = &res
 }
 
 func (c *projectCache) remove(project Project) {