More sync operations

node.go

@@ -38,21 +38,23 @@ type TreeNode struct {
 }
 
 type Node struct {
-	UUID        string
-	UserID      int    `db:"user_id"`
-	ParentUUID  string `db:"parent_uuid"`
-	CryptoKeyID int    `db:"crypto_key_id"`
-	Name        string
-	Content     string
-	Updated     time.Time
-	Files       []File
-	Complete    bool
-	Level       int
-
-	ChecklistGroups []ChecklistGroup
-
+	UUID             string
+	UserID           int    `db:"user_id"`
+	ParentUUID       string `db:"parent_uuid"`
+	Name             string
+	Created          time.Time
+	Updated          time.Time
+	Deleted          bool
+	CreatedSeq       uint64        `db:"created_seq"`
+	UpdatedSeq       uint64        `db:"updated_seq"`
+	DeletedSeq       sql.NullInt64 `db:"deleted_seq"`
+	Content          string
 	ContentEncrypted string `db:"content_encrypted" json:"-"`
 	Markdown         bool
+
+	// CryptoKeyID    int    `db:"crypto_key_id"`
+	//Files           []File
+	//ChecklistGroups []ChecklistGroup
 }
 
 func NodeTree(userID, offset int, synced uint64) (nodes []TreeNode, maxSeq uint64, moreRowsExist bool, err error) { // {{{
@@ -72,7 +74,8 @@ func NodeTree(userID, offset int, synced uint64) (nodes []TreeNode, maxSeq uint6
 		FROM
 			public.node
 		WHERE
-			user_id = $1 AND (
+			user_id = $1 AND 
+			NOT history AND (
 				created_seq > $4 OR
 				updated_seq > $4 OR
 				deleted_seq > $4
@@ -91,11 +94,6 @@ func NodeTree(userID, offset int, synced uint64) (nodes []TreeNode, maxSeq uint6
 	}
 	defer rows.Close()
 
-	type resultRow struct {
-		Node
-		Level int
-	}
-
 	nodes = []TreeNode{}
 	numNodes := 0
 	for rows.Next() {
@@ -120,6 +118,71 @@ func NodeTree(userID, offset int, synced uint64) (nodes []TreeNode, maxSeq uint6
 
 	return
 } // }}}
+func Nodes(userID, offset int, synced uint64, clientUUID string) (nodes []Node, maxSeq uint64, moreRowsExist bool, err error) { // {{{
+	var rows *sqlx.Rows
+	rows, err = db.Queryx(`
+		SELECT
+			uuid,
+			COALESCE(parent_uuid, '') AS parent_uuid,
+			name,
+			created,
+			updated,
+			deleted IS NOT NULL AS deleted,
+			created_seq,
+			updated_seq,
+			deleted_seq,
+			content,
+			content_encrypted,
+			markdown
+		FROM
+			public.node
+		WHERE
+			user_id = $1 AND
+			client != $5 AND
+			NOT history AND (
+				created_seq > $4 OR
+				updated_seq > $4 OR
+				deleted_seq > $4
+			)
+		ORDER BY
+			id ASC
+		LIMIT $2 OFFSET $3
+		`,
+		userID,
+		SYNC_PAGINATION+1,
+		offset,
+		synced,
+		clientUUID,
+	)
+	if err != nil {
+		return
+	}
+	defer rows.Close()
+
+	nodes = []Node{}
+	numNodes := 0
+	for rows.Next() {
+		// Query selects up to one more row than the decided limit.
+		// Saves one SQL query for row counting.
+		// Thus if numNodes is larger than the limit, more rows exist for the next call.
+		numNodes++
+		if numNodes > SYNC_PAGINATION {
+			moreRowsExist = true
+			return
+		}
+
+		node := Node{}
+		if err = rows.StructScan(&node); err != nil {
+			return
+		}
+		nodes = append(nodes, node)
+
+		// DeletedSeq will be 0 if invalid, and thus not be a problem for the max function.
+		maxSeq = max(maxSeq, node.CreatedSeq, node.UpdatedSeq, uint64(node.DeletedSeq.Int64))
+	}
+
+	return
+} // }}}
 func RetrieveNode(userID int, nodeUUID string) (node Node, err error) { // {{{
 	var rows *sqlx.Row
 	rows = db.QueryRowx(`