refactor: move pkg/ to internal/ and update imports
	
		
			
	
		
	
	
				
					
				
			Restructure project by relocating package contents from pkg/ to internal/ to better reflect internal-only usage. This commit is initial step to prepare project for public api
This commit is contained in:
		
							
								
								
									
										66
									
								
								internal/search/search.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								internal/search/search.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | ||||
| // This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan. | ||||
| // It has been modified as part of "ALR - Any Linux Repository" by the ALR Authors. | ||||
| // | ||||
| // ALR - Any Linux Repository | ||||
| // Copyright (C) 2025 The ALR Authors | ||||
| // | ||||
| // This program is free software: you can redistribute it and/or modify | ||||
| // it under the terms of the GNU General Public License as published by | ||||
| // the Free Software Foundation, either version 3 of the License, or | ||||
| // (at your option) any later version. | ||||
| // | ||||
| // This program is distributed in the hope that it will be useful, | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| // GNU General Public License for more details. | ||||
| // | ||||
| // You should have received a copy of the GNU General Public License | ||||
| // along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
|  | ||||
| package search | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"github.com/jmoiron/sqlx" | ||||
|  | ||||
| 	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||
| ) | ||||
|  | ||||
| type PackagesProvider interface { | ||||
| 	GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) | ||||
| } | ||||
|  | ||||
| type Searcher struct { | ||||
| 	pp PackagesProvider | ||||
| } | ||||
|  | ||||
| func New(pp PackagesProvider) *Searcher { | ||||
| 	return &Searcher{ | ||||
| 		pp: pp, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (s *Searcher) Search( | ||||
| 	ctx context.Context, | ||||
| 	opts *SearchOptions, | ||||
| ) ([]database.Package, error) { | ||||
| 	var packages []database.Package | ||||
|  | ||||
| 	where, args := opts.WhereClause() | ||||
| 	result, err := s.pp.GetPkgs(ctx, where, args...) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	for result.Next() { | ||||
| 		var dbPkg database.Package | ||||
| 		err = result.StructScan(&dbPkg) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
| 		packages = append(packages, dbPkg) | ||||
| 	} | ||||
|  | ||||
| 	return packages, nil | ||||
| } | ||||
							
								
								
									
										86
									
								
								internal/search/search_options_builder.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								internal/search/search_options_builder.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,86 @@ | ||||
| // ALR - Any Linux Repository | ||||
| // Copyright (C) 2025 The ALR Authors | ||||
| // | ||||
| // This program is free software: you can redistribute it and/or modify | ||||
| // it under the terms of the GNU General Public License as published by | ||||
| // the Free Software Foundation, either version 3 of the License, or | ||||
| // (at your option) any later version. | ||||
| // | ||||
| // This program is distributed in the hope that it will be useful, | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| // GNU General Public License for more details. | ||||
| // | ||||
| // You should have received a copy of the GNU General Public License | ||||
| // along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
|  | ||||
| package search | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| type SearchOptions struct { | ||||
| 	conditions []string | ||||
| 	args       []any | ||||
| } | ||||
|  | ||||
| func (o *SearchOptions) WhereClause() (string, []any) { | ||||
| 	if len(o.conditions) == 0 { | ||||
| 		return "", nil | ||||
| 	} | ||||
| 	return strings.Join(o.conditions, " AND "), o.args | ||||
| } | ||||
|  | ||||
| type SearchOptionsBuilder struct { | ||||
| 	options SearchOptions | ||||
| } | ||||
|  | ||||
| func NewSearchOptions() *SearchOptionsBuilder { | ||||
| 	return &SearchOptionsBuilder{} | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) withGeneralLike(key, value string) *SearchOptionsBuilder { | ||||
| 	if value != "" { | ||||
| 		b.options.conditions = append(b.options.conditions, fmt.Sprintf("%s LIKE ?", key)) | ||||
| 		b.options.args = append(b.options.args, "%"+value+"%") | ||||
| 	} | ||||
| 	return b | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) withGeneralEqual(key string, value any) *SearchOptionsBuilder { | ||||
| 	if value != "" { | ||||
| 		b.options.conditions = append(b.options.conditions, fmt.Sprintf("%s = ?", key)) | ||||
| 		b.options.args = append(b.options.args, value) | ||||
| 	} | ||||
| 	return b | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) withGeneralJsonArrayContains(key string, value any) *SearchOptionsBuilder { | ||||
| 	if value != "" { | ||||
| 		b.options.conditions = append(b.options.conditions, fmt.Sprintf("json_array_contains(%s, ?)", key)) | ||||
| 		b.options.args = append(b.options.args, value) | ||||
| 	} | ||||
| 	return b | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) WithName(name string) *SearchOptionsBuilder { | ||||
| 	return b.withGeneralLike("name", name) | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) WithDescription(description string) *SearchOptionsBuilder { | ||||
| 	return b.withGeneralLike("description", description) | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) WithRepository(repository string) *SearchOptionsBuilder { | ||||
| 	return b.withGeneralEqual("repository", repository) | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) WithProvides(provides string) *SearchOptionsBuilder { | ||||
| 	return b.withGeneralJsonArrayContains("provides", provides) | ||||
| } | ||||
|  | ||||
| func (b *SearchOptionsBuilder) Build() *SearchOptions { | ||||
| 	return &b.options | ||||
| } | ||||
							
								
								
									
										65
									
								
								internal/search/search_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								internal/search/search_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,65 @@ | ||||
| // ALR - Any Linux Repository | ||||
| // Copyright (C) 2025 The ALR Authors | ||||
| // | ||||
| // This program is free software: you can redistribute it and/or modify | ||||
| // it under the terms of the GNU General Public License as published by | ||||
| // the Free Software Foundation, either version 3 of the License, or | ||||
| // (at your option) any later version. | ||||
| // | ||||
| // This program is distributed in the hope that it will be useful, | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| // GNU General Public License for more details. | ||||
| // | ||||
| // You should have received a copy of the GNU General Public License | ||||
| // along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
|  | ||||
| package search_test | ||||
|  | ||||
| import ( | ||||
| 	"testing" | ||||
|  | ||||
| 	"github.com/stretchr/testify/assert" | ||||
|  | ||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/search" | ||||
| ) | ||||
|  | ||||
| func TestSearhOptionsBuilder(t *testing.T) { | ||||
| 	type testCase struct { | ||||
| 		name          string | ||||
| 		prepare       func() *search.SearchOptions | ||||
| 		expectedWhere string | ||||
| 		expectedArgs  []any | ||||
| 	} | ||||
|  | ||||
| 	for _, tc := range []testCase{ | ||||
| 		{ | ||||
| 			name: "Empty fields", | ||||
| 			prepare: func() *search.SearchOptions { | ||||
| 				return search.NewSearchOptions(). | ||||
| 					Build() | ||||
| 			}, | ||||
| 			expectedWhere: "", | ||||
| 			expectedArgs:  []any{}, | ||||
| 		}, | ||||
| 		{ | ||||
| 			name: "All fields", | ||||
| 			prepare: func() *search.SearchOptions { | ||||
| 				return search.NewSearchOptions(). | ||||
| 					WithName("foo"). | ||||
| 					WithDescription("bar"). | ||||
| 					WithRepository("buz"). | ||||
| 					WithProvides("test"). | ||||
| 					Build() | ||||
| 			}, | ||||
| 			expectedWhere: "name LIKE ? AND description LIKE ? AND repository = ? AND json_array_contains(provides, ?)", | ||||
| 			expectedArgs:  []any{"%foo%", "%bar%", "buz", "test"}, | ||||
| 		}, | ||||
| 	} { | ||||
| 		t.Run(tc.name, func(t *testing.T) { | ||||
| 			whereClause, args := tc.prepare().WhereClause() | ||||
| 			assert.Equal(t, tc.expectedWhere, whereClause) | ||||
| 			assert.ElementsMatch(t, tc.expectedArgs, args) | ||||
| 		}) | ||||
| 	} | ||||
| } | ||||
		Reference in New Issue
	
	Block a user