Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@KenWilliamson
KenWilliamson committed Feb 2, 2021
1 parent 0070dfa commit e310a70
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 71 deletions.
145 changes: 79 additions & 66 deletions coverage.out
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,4 @@
mode: set
github.com/Ulbora/cocka2notesApi/checkboxItem.go:32.70,37.16 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:50.2,51.13 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:37.16,42.11 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:45.3,45.26 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:42.11,44.4 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:45.26,48.4 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:55.71,60.16 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:73.2,74.13 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:60.16,65.11 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:68.3,68.26 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:65.11,67.4 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:68.26,71.4 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:78.59,89.2 9 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:91.64,94.17 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:94.17,95.29 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:95.29,97.38 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:97.38,100.26 3 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:110.5,111.10 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:100.26,102.31 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:102.31,107.12 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:114.8,114.28 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:114.28,119.29 4 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:119.29,120.38 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:120.38,126.10 6 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:133.72,135.2 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:138.75,140.2 1 1
github.com/Ulbora/cocka2notesApi/note.go:30.49,35.16 5 1
github.com/Ulbora/cocka2notesApi/note.go:44.2,45.13 2 1
github.com/Ulbora/cocka2notesApi/note.go:35.16,40.15 5 1
github.com/Ulbora/cocka2notesApi/note.go:40.15,42.4 1 1
github.com/Ulbora/cocka2notesApi/note.go:49.50,54.16 5 1
github.com/Ulbora/cocka2notesApi/note.go:63.2,64.13 2 1
github.com/Ulbora/cocka2notesApi/note.go:54.16,59.14 5 1
github.com/Ulbora/cocka2notesApi/note.go:59.14,61.4 1 1
github.com/Ulbora/cocka2notesApi/note.go:68.60,78.24 8 1
github.com/Ulbora/cocka2notesApi/note.go:85.2,88.12 3 1
github.com/Ulbora/cocka2notesApi/note.go:78.24,81.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:81.8,83.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:92.48,100.24 8 1
github.com/Ulbora/cocka2notesApi/note.go:106.2,109.12 3 1
github.com/Ulbora/cocka2notesApi/note.go:100.24,103.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:103.8,105.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:113.64,121.24 7 1
github.com/Ulbora/cocka2notesApi/note.go:128.2,131.18 3 1
github.com/Ulbora/cocka2notesApi/note.go:121.24,124.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:124.8,126.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:135.70,146.2 9 1
github.com/Ulbora/cocka2notesApi/note.go:148.59,149.28 1 1
github.com/Ulbora/cocka2notesApi/note.go:149.28,150.32 1 1
github.com/Ulbora/cocka2notesApi/note.go:150.32,154.9 4 1
github.com/Ulbora/cocka2notesApi/note.go:159.65,161.28 2 1
github.com/Ulbora/cocka2notesApi/note.go:177.2,177.13 1 1
github.com/Ulbora/cocka2notesApi/note.go:161.28,163.29 2 1
github.com/Ulbora/cocka2notesApi/note.go:163.29,171.28 8 1
github.com/Ulbora/cocka2notesApi/note.go:174.4,174.9 1 1
github.com/Ulbora/cocka2notesApi/note.go:171.28,173.5 1 1
github.com/Ulbora/cocka2notesApi/note.go:180.51,181.28 1 1
github.com/Ulbora/cocka2notesApi/note.go:181.28,182.32 1 1
github.com/Ulbora/cocka2notesApi/note.go:182.32,186.9 4 1
github.com/Ulbora/cocka2notesApi/note.go:191.57,193.28 2 1
github.com/Ulbora/cocka2notesApi/note.go:208.2,208.13 1 1
github.com/Ulbora/cocka2notesApi/note.go:193.28,194.29 1 1
github.com/Ulbora/cocka2notesApi/note.go:194.29,202.28 8 1
github.com/Ulbora/cocka2notesApi/note.go:205.4,205.9 1 1
github.com/Ulbora/cocka2notesApi/note.go:202.28,204.5 1 1
github.com/Ulbora/cocka2notesApi/note.go:212.49,214.2 1 1
github.com/Ulbora/cocka2notesApi/noteItem.go:32.58,37.16 5 1
github.com/Ulbora/cocka2notesApi/noteItem.go:50.2,51.13 2 1
github.com/Ulbora/cocka2notesApi/noteItem.go:37.16,42.11 5 1
Expand Down Expand Up @@ -131,3 +65,82 @@ github.com/Ulbora/cocka2notesApi/user.go:145.15,147.4 1 1
github.com/Ulbora/cocka2notesApi/api.go:66.49,69.22 3 1
github.com/Ulbora/cocka2notesApi/api.go:72.2,72.24 1 1
github.com/Ulbora/cocka2notesApi/api.go:69.22,71.3 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:32.70,37.16 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:50.2,51.13 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:37.16,42.11 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:45.3,45.26 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:42.11,44.4 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:45.26,48.4 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:55.71,60.16 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:73.2,74.13 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:60.16,65.11 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:68.3,68.26 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:65.11,67.4 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:68.26,71.4 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:78.59,89.2 9 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:91.64,94.17 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:94.17,95.29 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:95.29,97.38 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:97.38,100.26 3 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:110.5,111.10 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:100.26,102.31 2 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:102.31,107.12 5 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:114.8,114.28 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:114.28,119.29 4 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:119.29,120.38 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:120.38,126.10 6 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:133.72,135.2 1 1
github.com/Ulbora/cocka2notesApi/checkboxItem.go:138.75,140.2 1 1
github.com/Ulbora/cocka2notesApi/note.go:30.49,35.16 5 1
github.com/Ulbora/cocka2notesApi/note.go:44.2,45.13 2 1
github.com/Ulbora/cocka2notesApi/note.go:35.16,40.15 5 1
github.com/Ulbora/cocka2notesApi/note.go:40.15,42.4 1 1
github.com/Ulbora/cocka2notesApi/note.go:49.50,54.16 5 1
github.com/Ulbora/cocka2notesApi/note.go:63.2,64.13 2 1
github.com/Ulbora/cocka2notesApi/note.go:54.16,59.14 5 1
github.com/Ulbora/cocka2notesApi/note.go:59.14,61.4 1 1
github.com/Ulbora/cocka2notesApi/note.go:68.60,78.24 8 1
github.com/Ulbora/cocka2notesApi/note.go:85.2,88.12 3 1
github.com/Ulbora/cocka2notesApi/note.go:78.24,81.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:81.8,83.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:92.48,100.24 8 1
github.com/Ulbora/cocka2notesApi/note.go:106.2,109.12 3 1
github.com/Ulbora/cocka2notesApi/note.go:100.24,103.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:103.8,105.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:113.64,121.24 7 1
github.com/Ulbora/cocka2notesApi/note.go:128.2,131.18 3 1
github.com/Ulbora/cocka2notesApi/note.go:121.24,124.3 2 1
github.com/Ulbora/cocka2notesApi/note.go:124.8,126.3 1 1
github.com/Ulbora/cocka2notesApi/note.go:135.70,146.2 9 1
github.com/Ulbora/cocka2notesApi/note.go:148.59,149.28 1 1
github.com/Ulbora/cocka2notesApi/note.go:149.28,150.32 1 1
github.com/Ulbora/cocka2notesApi/note.go:150.32,154.9 4 1
github.com/Ulbora/cocka2notesApi/note.go:159.65,161.28 2 1
github.com/Ulbora/cocka2notesApi/note.go:200.2,200.13 1 1
github.com/Ulbora/cocka2notesApi/note.go:161.28,163.29 2 1
github.com/Ulbora/cocka2notesApi/note.go:163.29,171.73 8 1
github.com/Ulbora/cocka2notesApi/note.go:197.4,197.9 1 1
github.com/Ulbora/cocka2notesApi/note.go:171.73,172.27 1 0
github.com/Ulbora/cocka2notesApi/note.go:189.5,189.25 1 0
github.com/Ulbora/cocka2notesApi/note.go:172.27,174.30 2 0
github.com/Ulbora/cocka2notesApi/note.go:187.6,187.29 1 0
github.com/Ulbora/cocka2notesApi/note.go:174.30,175.22 1 0
github.com/Ulbora/cocka2notesApi/note.go:184.7,185.32 2 0
github.com/Ulbora/cocka2notesApi/note.go:175.22,177.8 1 0
github.com/Ulbora/cocka2notesApi/note.go:177.13,177.33 1 0
github.com/Ulbora/cocka2notesApi/note.go:177.33,179.8 1 0
github.com/Ulbora/cocka2notesApi/note.go:179.13,179.34 1 0
github.com/Ulbora/cocka2notesApi/note.go:179.34,181.8 1 0
github.com/Ulbora/cocka2notesApi/note.go:181.13,181.31 1 0
github.com/Ulbora/cocka2notesApi/note.go:181.31,183.8 1 0
github.com/Ulbora/cocka2notesApi/note.go:190.10,194.5 2 1
github.com/Ulbora/cocka2notesApi/note.go:203.51,204.28 1 1
github.com/Ulbora/cocka2notesApi/note.go:204.28,205.32 1 1
github.com/Ulbora/cocka2notesApi/note.go:205.32,209.9 4 1
github.com/Ulbora/cocka2notesApi/note.go:214.57,216.28 2 1
github.com/Ulbora/cocka2notesApi/note.go:231.2,231.13 1 1
github.com/Ulbora/cocka2notesApi/note.go:216.28,217.29 1 1
github.com/Ulbora/cocka2notesApi/note.go:217.29,225.28 8 1
github.com/Ulbora/cocka2notesApi/note.go:228.4,228.9 1 1
github.com/Ulbora/cocka2notesApi/note.go:225.28,227.5 1 1
github.com/Ulbora/cocka2notesApi/note.go:235.49,237.2 1 1
29 changes: 26 additions & 3 deletions note.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,33 @@ func (a *NotesAPI) getSavedCheckboxNote(id int64) *CheckboxNote {
cbn.OwnerEmail = a.noteList[i].OwnerEmail
cbn.Title = a.noteList[i].Title
cbn.Type = a.noteList[i].Type
ilst := a.noteList[i].NoteItems.([]interface{})
for _, ci := range ilst {
cbn.NoteItems = append(cbn.NoteItems, ci.(CheckboxNoteItem))
var ilst []CheckboxNoteItem
if rec, ok := a.noteList[i].NoteItems.([]map[string]interface{}); ok {
for _, r := range rec {
var ci CheckboxNoteItem
for key, val := range r {
if key == "id" {
ci.ID = val.(int64)
} else if key == "noteId" {
ci.NoteID = val.(int64)
} else if key == "checked" {
ci.Checked = val.(bool)
} else if key == "text" {
ci.Text = val.(string)
}
a.log.Debug("key: ", key)
a.log.Debug("val: ", val)
}
ilst = append(ilst, ci)
}
cbn.NoteItems = ilst
} else {
ilst = a.noteList[i].NoteItems.([]CheckboxNoteItem)
cbn.NoteItems = ilst
//fmt.Printf("record not a map[string]interface{}: %v\n", record)
}
//ilst := a.noteList[i].NoteItems.([]CheckboxNoteItem)

break
}
}
Expand Down
4 changes: 2 additions & 2 deletions note_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,8 @@ func TestNotesAPI_setSavedCheckboxNote(t *testing.T) {
func TestNotesAPI_getSavedCheckboxNote(t *testing.T) {
var sapi NotesAPI

// var cbilst []CheckboxNoteItem
var cbilst []interface{}
var cbilst []CheckboxNoteItem
//var cbilst []interface{}
var cbi1 CheckboxNoteItem
cbi1.Checked = true
cbi1.ID = 1
Expand Down

0 comments on commit e310a70

Please sign in to comment.