back round 0 view raw

appview/db: ignore pagination for non-paginated methods #713

merged

opened by

boltless.me 1 month ago targeting master from push-ztsunkmpnsry

Each methods will check if page.limit is higher than 0, and only applies pagination when limit is higher than 0

Signed-off-by: Seongmin Lee git@boltless.me

options

unified split

Changed files

+15 -9

appview

issues.go

notifications.go

+8 -5

appview/db/issues.go

···

       101
       101
        
       	pLower := FilterGte("row_num", page.Offset+1)

     

       102
       102
        
       	pUpper := FilterLte("row_num", page.Offset+page.Limit)

     

       103
       103
        
       

     

       104
       104
       -
       	args = append(args, pLower.Arg()...)

     

       105
       105
       -
       	args = append(args, pUpper.Arg()...)

     

       106
       106
       -
       	pagination := " where " + pLower.Condition() + " and " + pUpper.Condition()

     

       104
       104
       +
       	pageClause := ""

     

       105
       105
       +
       	if page.Limit > 0 {

     

       106
       106
       +
       		args = append(args, pLower.Arg()...)

     

       107
       107
       +
       		args = append(args, pUpper.Arg()...)

     

       108
       108
       +
       		pageClause = " where " + pLower.Condition() + " and " + pUpper.Condition()

     

       109
       109
       +
       	}

     

       107
       110
        
       

     

       108
       111
        
       	query := fmt.Sprintf(

     

       109
       112
        
       		`

     
···

       128
       131
        
       		%s

     

       129
       132
        
       		`,

     

       130
       133
        
       		whereClause,

     

       131
       131
       -
       		pagination,

     

       134
       134
       +
       		pageClause,

     

       132
       135
        
       	)

     

       133
       136
        
       

     

       134
       137
        
       	rows, err := e.Query(query, args...)

     
···

       244
       247
        
       }

     

       245
       248
        
       

     

       246
       249
        
       func GetIssues(e Execer, filters ...filter) ([]models.Issue, error) {

     

       247
       247
       -
       	return GetIssuesPaginated(e, pagination.FirstPage(), filters...)

     

       250
       250
       +
       	return GetIssuesPaginated(e, pagination.Page{}, filters...)

     

       248
       251
        
       }

     

       249
       252
        
       

     

       250
       253
        
       func AddIssueComment(e Execer, c models.IssueComment) (int64, error) {

+7 -4

appview/db/notifications.go

···

       60
       60
        
       			whereClause += " AND " + condition

     

       61
       61
        
       		}

     

       62
       62
        
       	}

     

       63
       63
       +
       	pageClause := ""

     

       64
       64
       +
       	if page.Limit > 0 {

     

       65
       65
       +
       		pageClause = " limit ? offset ? "

     

       66
       66
       +
       		args = append(args, page.Limit, page.Offset)

     

       67
       67
       +
       	}

     

       63
       68
        
       

     

       64
       69
        
       	query := fmt.Sprintf(`

     

       65
       70
        
       		select id, recipient_did, actor_did, type, entity_type, entity_id, read, created, repo_id, issue_id, pull_id

     

       66
       71
        
       		from notifications

     

       67
       72
        
       		%s

     

       68
       73
        
       		order by created desc

     

       69
       69
       -
       		limit ? offset ?

     

       70
       70
       -
       	`, whereClause)

     

       71
       71
       -
       

     

       72
       72
       -
       	args = append(args, page.Limit, page.Offset)

     

       74
       74
       +
       		%s

     

       75
       75
       +
       	`, whereClause, pageClause)

     

       73
       76
        
       

     

       74
       77
        
       	rows, err := e.QueryContext(context.Background(), query, args...)

     

       75
       78
        
       	if err != nil {