Merge branch 'main' into fix-289

Xemdo · web-flow · commit 99d2a52cb11b · 2023-12-03T12:27:50.000-08:00
diff --git a/internal/mock_api/endpoints/users/blocks.go b/internal/mock_api/endpoints/users/blocks.go
@@ -75,15 +75,16 @@ func getBlocks(w http.ResponseWriter, r *http.Request) {
 	}
 
 	apiResponse := models.APIResponse{
-		Data: dbr.Data,
+		Data:       dbr.Data,
+		Pagination: &models.APIPagination{},
 	}
 
 	if len(dbr.Data.([]database.Block)) == 0 {
-		dbr.Data = make([]database.Block, 0)
+		apiResponse.Data = []database.Block{}
 	}
 
 	if len(dbr.Data.([]database.Block)) == dbr.Limit {
-		apiResponse.Pagination = &models.APIPagination{Cursor: dbr.Cursor}
+		apiResponse.Pagination.Cursor = dbr.Cursor
 	}
 
 	bytes, _ := json.Marshal(apiResponse)

Original file line number	Diff line number	Diff line change
`@@ -75,15 +75,16 @@ func getBlocks(w http.ResponseWriter, r *http.Request) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`apiResponse := models.APIResponse{`
`78`		`- Data: dbr.Data,`
	`78`	`+ Data: dbr.Data,`
	`79`	`+ Pagination: &models.APIPagination{},`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`if len(dbr.Data.([]database.Block)) == 0 {`
`82`		`- dbr.Data = make([]database.Block, 0)`
	`83`	`+ apiResponse.Data = []database.Block{}`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`if len(dbr.Data.([]database.Block)) == dbr.Limit {`
`86`		`- apiResponse.Pagination = &models.APIPagination{Cursor: dbr.Cursor}`
	`87`	`+ apiResponse.Pagination.Cursor = dbr.Cursor`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`bytes, _ := json.Marshal(apiResponse)`