diff --git a/internal/email/auth.go b/internal/email/auth.go index e1704af5..ca6ae329 100644 --- a/internal/email/auth.go +++ b/internal/email/auth.go @@ -11,6 +11,6 @@ type PasswordResetTemplateData struct { } // Get returns the password reset email template data. -func (d *PasswordResetTemplateData) Get() interface{} { +func (d *PasswordResetTemplateData) RenderData() interface{} { return d } diff --git a/internal/email/auth_test.go b/internal/email/auth_test.go index 3ef02d3a..7a16a1aa 100644 --- a/internal/email/auth_test.go +++ b/internal/email/auth_test.go @@ -17,5 +17,5 @@ func TestPasswordResetTemplateData_Get(t *testing.T) { SupportEmail: "info@example.com", } - assert.Equal(t, data, data.Get()) + assert.Equal(t, data, data.RenderData()) } diff --git a/internal/email/organization.go b/internal/email/organization.go index dfc2f43f..98324874 100644 --- a/internal/email/organization.go +++ b/internal/email/organization.go @@ -12,6 +12,6 @@ type OrganizationInviteTemplateData struct { } // Get returns the invitation email template data. -func (d *OrganizationInviteTemplateData) Get() interface{} { +func (d *OrganizationInviteTemplateData) RenderData() interface{} { return d } diff --git a/internal/email/organization_test.go b/internal/email/organization_test.go index 516078aa..1f082a9b 100644 --- a/internal/email/organization_test.go +++ b/internal/email/organization_test.go @@ -18,5 +18,5 @@ func TestOrganizationInviteTemplateData_Get(t *testing.T) { SupportEmail: "info@example.com", } - assert.Equal(t, data, data.Get()) + assert.Equal(t, data, data.RenderData()) } diff --git a/internal/email/system.go b/internal/email/system.go index bec2d8da..ad783222 100644 --- a/internal/email/system.go +++ b/internal/email/system.go @@ -14,6 +14,6 @@ type LicenseExpiryTemplateData struct { } // Get returns the license expiration email template data. -func (d *LicenseExpiryTemplateData) Get() interface{} { +func (d *LicenseExpiryTemplateData) RenderData() interface{} { return d } diff --git a/internal/email/system_test.go b/internal/email/system_test.go index 07e79653..6cb6fcd0 100644 --- a/internal/email/system_test.go +++ b/internal/email/system_test.go @@ -31,5 +31,5 @@ func TestLicenseExpiryTemplateData_Get(t *testing.T) { SupportEmail: "info@example.com", } - assert.Equal(t, data, data.Get()) + assert.Equal(t, data, data.RenderData()) } diff --git a/internal/email/template.go b/internal/email/template.go index c43b882a..8fac77b4 100644 --- a/internal/email/template.go +++ b/internal/email/template.go @@ -10,7 +10,7 @@ import ( // TemplateData represents the data needed to render an email template. type TemplateData interface { // Get returns the template data. - Get() any + RenderData() any } // Template is a struct that represents the data needed to render @@ -30,7 +30,7 @@ func (t *Template) Validate() error { // Render returns the rendered template. func (t *Template) Render() (string, error) { - return emailBody[*template.Template](t.Path, t.Data.Get(), template.ParseFiles) + return emailBody[*template.Template](t.Path, t.Data.RenderData(), template.ParseFiles) } // NewTemplate returns a new email template. diff --git a/internal/email/template_test.go b/internal/email/template_test.go index 6da61d1c..d3b0a230 100644 --- a/internal/email/template_test.go +++ b/internal/email/template_test.go @@ -15,7 +15,7 @@ type testTemplateData struct { SupportEmail string `validate:"required,email"` } -func (d *testTemplateData) Get() interface{} { +func (d *testTemplateData) RenderData() interface{} { return d } diff --git a/internal/email/user.go b/internal/email/user.go index 7685269c..05ee07b2 100644 --- a/internal/email/user.go +++ b/internal/email/user.go @@ -11,6 +11,6 @@ type UserWelcomeTemplateData struct { } // Get returns the welcome email template data. -func (d *UserWelcomeTemplateData) Get() interface{} { +func (d *UserWelcomeTemplateData) RenderData() interface{} { return d } diff --git a/internal/email/user_test.go b/internal/email/user_test.go index 03200200..bc30a514 100644 --- a/internal/email/user_test.go +++ b/internal/email/user_test.go @@ -17,5 +17,5 @@ func TestUserWelcomeTemplateData_Get(t *testing.T) { SupportEmail: "info@example.com", } - assert.Equal(t, data, data.Get()) + assert.Equal(t, data, data.RenderData()) } diff --git a/internal/pkg/default.go b/internal/pkg/default.go index 35c341ea..d76f609e 100644 --- a/internal/pkg/default.go +++ b/internal/pkg/default.go @@ -2,7 +2,7 @@ package pkg // GetDefault returns the value if it is not the zero value of the type, otherwise // it returns the fallback. -func GetDefault[T comparable](value, fallback T) T { +func RenderDefault[T comparable](value, fallback T) T { var zero T if value == zero { return fallback @@ -13,7 +13,7 @@ func GetDefault[T comparable](value, fallback T) T { // GetDefaultPtr returns the value if it is not nil, otherwise it returns the // fallback. -func GetDefaultPtr[T any](value *T, fallback T) T { +func RenderDefaultPtr[T any](value *T, fallback T) T { if value == nil { return fallback } diff --git a/internal/pkg/default_test.go b/internal/pkg/default_test.go index 5c8c39a2..aeddf8c9 100644 --- a/internal/pkg/default_test.go +++ b/internal/pkg/default_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestGetDefault(t *testing.T) { +func TestRenderDefault(t *testing.T) { type args struct { value int fallback int @@ -38,12 +38,12 @@ func TestGetDefault(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - assert.Equal(t, tt.want, GetDefault(tt.args.value, tt.args.fallback)) + assert.Equal(t, tt.want, RenderDefault(tt.args.value, tt.args.fallback)) }) } } -func TestGetDefaultPtr(t *testing.T) { +func TestRenderDefaultPtr(t *testing.T) { type args struct { value *int fallback int @@ -78,7 +78,7 @@ func TestGetDefaultPtr(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - assert.Equal(t, tt.want, GetDefaultPtr(tt.args.value, tt.args.fallback)) + assert.Equal(t, tt.want, RenderDefaultPtr(tt.args.value, tt.args.fallback)) }) } } diff --git a/internal/pkg/smtp/smtp_test.go b/internal/pkg/smtp/smtp_test.go index 918d01b1..7c55bdbe 100644 --- a/internal/pkg/smtp/smtp_test.go +++ b/internal/pkg/smtp/smtp_test.go @@ -21,7 +21,7 @@ type testTemplateData struct { Field string } -func (t *testTemplateData) Get() any { +func (t *testTemplateData) RenderData() any { return t } diff --git a/internal/pkg/tracing/tracing.go b/internal/pkg/tracing/tracing.go index a2df4f39..98581d4e 100644 --- a/internal/pkg/tracing/tracing.go +++ b/internal/pkg/tracing/tracing.go @@ -41,7 +41,6 @@ func NewTracerProvider(ctx context.Context, version *model.VersionInfo, service if err != nil { return nil, err } - tracerProvider := sdktrace.NewTracerProvider( sdktrace.WithResource(resource.NewWithAttributes( semconv.SchemaURL, diff --git a/internal/pkg/validate/validate.go b/internal/pkg/validate/validate.go index 1767431f..688a568b 100644 --- a/internal/pkg/validate/validate.go +++ b/internal/pkg/validate/validate.go @@ -7,7 +7,7 @@ var ( ) // GetValidator returns the validator instance. -func GetValidator() *validator.Validate { +func RenderValidator() *validator.Validate { return validate } diff --git a/internal/pkg/validate/validate_test.go b/internal/pkg/validate/validate_test.go index bc2d0ba7..9c7d55a2 100644 --- a/internal/pkg/validate/validate_test.go +++ b/internal/pkg/validate/validate_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" ) -func TestGetValidator(t *testing.T) { - assert.NotNil(t, GetValidator()) +func TestRenderValidator(t *testing.T) { + assert.NotNil(t, RenderValidator()) } func TestStruct(t *testing.T) { diff --git a/internal/queue/client.go b/internal/queue/client.go index a43bcd8f..1ce1fa59 100644 --- a/internal/queue/client.go +++ b/internal/queue/client.go @@ -74,8 +74,8 @@ func (c *Client) Enqueue(ctx context.Context, task *asynq.Task, opts ...asynq.Op return info, nil } -// GetTaskInfo returns the task info for the given task ID in a queue. -func (c *Client) GetTaskInfo(queue string, id string) (*asynq.TaskInfo, error) { +// TaskInfo returns the task info for the given task ID in a queue. +func (c *Client) TaskInfo(queue string, id string) (*asynq.TaskInfo, error) { return c.inspector.GetTaskInfo(queue, id) } @@ -100,7 +100,7 @@ func (c *Client) Ping(ctx context.Context) error { case <-ctx.Done(): return errors.Join(ErrReceiveTask, ctx.Err()) default: - if info, err = c.GetTaskInfo(info.Queue, info.ID); err != nil { + if info, err = c.TaskInfo(info.Queue, info.ID); err != nil { return errors.Join(ErrReceiveTask, err) } } diff --git a/internal/queue/client_integration_test.go b/internal/queue/client_integration_test.go index d9c1c4ef..8c69a0f8 100644 --- a/internal/queue/client_integration_test.go +++ b/internal/queue/client_integration_test.go @@ -84,7 +84,7 @@ func (s *AsynqClientIntegrationTestSuite) TestEnqueue() { s.Assert().Equal(asynq.TaskStatePending, info.State) } -func (s *AsynqClientIntegrationTestSuite) TestGetTaskInfo() { +func (s *AsynqClientIntegrationTestSuite) TestTaskInfo() { ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() @@ -96,7 +96,7 @@ func (s *AsynqClientIntegrationTestSuite) TestGetTaskInfo() { for info.State != asynq.TaskStateCompleted { s.Require().NoError(ctx.Err()) - info, err = s.client.GetTaskInfo(info.Queue, info.ID) + info, err = s.client.TaskInfo(info.Queue, info.ID) s.Require().NoError(err) } diff --git a/internal/repository/assignment.go b/internal/repository/assignment.go index 76ef65fc..de3ae247 100644 --- a/internal/repository/assignment.go +++ b/internal/repository/assignment.go @@ -10,7 +10,7 @@ import ( type AssignmentRepository interface { Create(ctx context.Context, assignment *model.Assignment) error Get(ctx context.Context, id model.ID) (*model.Assignment, error) - GetByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) - GetByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) + FindByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) + FindByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) Delete(ctx context.Context, id model.ID) error } diff --git a/internal/repository/document.go b/internal/repository/document.go index c8a9e6d4..0feeb92e 100644 --- a/internal/repository/document.go +++ b/internal/repository/document.go @@ -10,7 +10,7 @@ import ( type DocumentRepository interface { Create(ctx context.Context, belongsTo model.ID, document *model.Document) error Get(ctx context.Context, id model.ID) (*model.Document, error) - GetByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) + FindByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) GetAllBelongsTo(ctx context.Context, belongsTo model.ID, offset, limit int) ([]*model.Document, error) Update(ctx context.Context, id model.ID, patch map[string]any) (*model.Document, error) Delete(ctx context.Context, id model.ID) error diff --git a/internal/repository/issue.go b/internal/repository/issue.go index d0fb4ff6..ebb1ec9c 100644 --- a/internal/repository/issue.go +++ b/internal/repository/issue.go @@ -10,8 +10,8 @@ import ( type IssueRepository interface { Create(ctx context.Context, project model.ID, issue *model.Issue) error Get(ctx context.Context, id model.ID) (*model.Issue, error) - GetAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) - GetAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) + FindAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) + FindAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) AddWatcher(ctx context.Context, issue model.ID, user model.ID) error GetWatchers(ctx context.Context, issue model.ID) ([]*model.User, error) RemoveWatcher(ctx context.Context, issue model.ID, user model.ID) error diff --git a/internal/repository/neo4j/assignment.go b/internal/repository/neo4j/assignment.go index 2839124f..0cc65b7f 100644 --- a/internal/repository/neo4j/assignment.go +++ b/internal/repository/neo4j/assignment.go @@ -105,7 +105,7 @@ func (r *AssignmentRepository) Get(ctx context.Context, id model.ID) (*model.Ass return assignment, nil } -func (r *AssignmentRepository) GetByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (r *AssignmentRepository) FindByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { ctx, span := r.tracer.Start(ctx, "repository.neo4j.AssignmentRepository/GetByUser") defer span.End() @@ -129,7 +129,7 @@ func (r *AssignmentRepository) GetByUser(ctx context.Context, userID model.ID, o return assignments, nil } -func (r *AssignmentRepository) GetByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (r *AssignmentRepository) FindByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { ctx, span := r.tracer.Start(ctx, "repository.neo4j.AssignmentRepository/GetByResource") defer span.End() diff --git a/internal/repository/neo4j/assignment_integration_test.go b/internal/repository/neo4j/assignment_integration_test.go index 61451c6a..6341c45a 100644 --- a/internal/repository/neo4j/assignment_integration_test.go +++ b/internal/repository/neo4j/assignment_integration_test.go @@ -78,19 +78,19 @@ func (s *AssignmentRepositoryIntegrationTestSuite) TestGetByUser() { reviewer := testModel.NewAssignment(s.testUser.ID, s.testDoc.ID, model.AssignmentKindReviewer) s.Require().NoError(s.AssignmentRepo.Create(context.Background(), reviewer)) - assignments, err := s.AssignmentRepo.GetByUser(context.Background(), s.testUser.ID, 0, 10) + assignments, err := s.AssignmentRepo.FindByUser(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Len(assignments, 2) - assignments, err = s.AssignmentRepo.GetByUser(context.Background(), s.testUser.ID, 0, 1) + assignments, err = s.AssignmentRepo.FindByUser(context.Background(), s.testUser.ID, 0, 1) s.Require().NoError(err) s.Assert().Len(assignments, 1) - assignments, err = s.AssignmentRepo.GetByUser(context.Background(), s.testUser.ID, 1, 1) + assignments, err = s.AssignmentRepo.FindByUser(context.Background(), s.testUser.ID, 1, 1) s.Require().NoError(err) s.Assert().Len(assignments, 1) - assignments, err = s.AssignmentRepo.GetByUser(context.Background(), s.testUser.ID, 2, 1) + assignments, err = s.AssignmentRepo.FindByUser(context.Background(), s.testUser.ID, 2, 1) s.Require().NoError(err) s.Assert().Len(assignments, 0) } @@ -102,19 +102,19 @@ func (s *AssignmentRepositoryIntegrationTestSuite) TestGetByResource() { reviewer := testModel.NewAssignment(s.testUser.ID, s.testDoc.ID, model.AssignmentKindReviewer) s.Require().NoError(s.AssignmentRepo.Create(context.Background(), reviewer)) - assignments, err := s.AssignmentRepo.GetByResource(context.Background(), s.testDoc.ID, 0, 10) + assignments, err := s.AssignmentRepo.FindByResource(context.Background(), s.testDoc.ID, 0, 10) s.Require().NoError(err) s.Assert().Len(assignments, 2) - assignments, err = s.AssignmentRepo.GetByResource(context.Background(), s.testDoc.ID, 0, 1) + assignments, err = s.AssignmentRepo.FindByResource(context.Background(), s.testDoc.ID, 0, 1) s.Require().NoError(err) s.Assert().Len(assignments, 1) - assignments, err = s.AssignmentRepo.GetByResource(context.Background(), s.testDoc.ID, 1, 1) + assignments, err = s.AssignmentRepo.FindByResource(context.Background(), s.testDoc.ID, 1, 1) s.Require().NoError(err) s.Assert().Len(assignments, 1) - assignments, err = s.AssignmentRepo.GetByResource(context.Background(), s.testDoc.ID, 2, 1) + assignments, err = s.AssignmentRepo.FindByResource(context.Background(), s.testDoc.ID, 2, 1) s.Require().NoError(err) s.Assert().Len(assignments, 0) } diff --git a/internal/repository/neo4j/document.go b/internal/repository/neo4j/document.go index c0651c01..ae914dac 100644 --- a/internal/repository/neo4j/document.go +++ b/internal/repository/neo4j/document.go @@ -128,8 +128,8 @@ func (r *DocumentRepository) Get(ctx context.Context, id model.ID) (*model.Docum return doc, nil } -func (r *DocumentRepository) GetByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { - ctx, span := r.tracer.Start(ctx, "repository.neo4j.DocumentRepository/GetByCreator") +func (r *DocumentRepository) FindByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { + ctx, span := r.tracer.Start(ctx, "repository.neo4j.DocumentRepository/FindByCreator") defer span.End() cypher := ` diff --git a/internal/repository/neo4j/document_integration_test.go b/internal/repository/neo4j/document_integration_test.go index e4b7f146..a553eb35 100644 --- a/internal/repository/neo4j/document_integration_test.go +++ b/internal/repository/neo4j/document_integration_test.go @@ -73,24 +73,24 @@ func (s *DocumentRepositoryIntegrationTestSuite) TestGet() { s.Assert().Nil(s.document.UpdatedAt) } -func (s *DocumentRepositoryIntegrationTestSuite) TestGetByCreator() { +func (s *DocumentRepositoryIntegrationTestSuite) TestFindByCreator() { s.Require().NoError(s.DocumentRepo.Create(context.Background(), s.testUser.ID, s.document)) s.Require().NoError(s.DocumentRepo.Create(context.Background(), s.testUser.ID, testModel.NewDocument(s.testUser.ID))) s.Require().NoError(s.DocumentRepo.Create(context.Background(), s.testUser.ID, testModel.NewDocument(s.testUser.ID))) - documents, err := s.DocumentRepo.GetByCreator(context.Background(), s.testUser.ID, 0, 10) + documents, err := s.DocumentRepo.FindByCreator(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Len(documents, 3) - documents, err = s.DocumentRepo.GetByCreator(context.Background(), s.testUser.ID, 1, 2) + documents, err = s.DocumentRepo.FindByCreator(context.Background(), s.testUser.ID, 1, 2) s.Require().NoError(err) s.Assert().Len(documents, 2) - documents, err = s.DocumentRepo.GetByCreator(context.Background(), s.testUser.ID, 2, 2) + documents, err = s.DocumentRepo.FindByCreator(context.Background(), s.testUser.ID, 2, 2) s.Require().NoError(err) s.Assert().Len(documents, 1) - documents, err = s.DocumentRepo.GetByCreator(context.Background(), s.testUser.ID, 3, 2) + documents, err = s.DocumentRepo.FindByCreator(context.Background(), s.testUser.ID, 3, 2) s.Require().NoError(err) s.Assert().Len(documents, 0) } diff --git a/internal/repository/neo4j/issue.go b/internal/repository/neo4j/issue.go index 2e46cba1..6c75cc9d 100644 --- a/internal/repository/neo4j/issue.go +++ b/internal/repository/neo4j/issue.go @@ -243,7 +243,7 @@ func (r *IssueRepository) Get(ctx context.Context, id model.ID) (*model.Issue, e return issue, nil } -func (r *IssueRepository) GetAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { +func (r *IssueRepository) FindAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { ctx, span := r.tracer.Start(ctx, "repository.neo4j.IssueRepository/GetAllForProject") defer span.End() @@ -294,7 +294,7 @@ func (r *IssueRepository) GetAllForProject(ctx context.Context, projectID model. return issues, nil } -func (r *IssueRepository) GetAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { +func (r *IssueRepository) FindAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { ctx, span := r.tracer.Start(ctx, "repository.neo4j.IssueRepository/GetAllForProject") defer span.End() diff --git a/internal/repository/neo4j/issue_integration_test.go b/internal/repository/neo4j/issue_integration_test.go index ad029b32..6d9020eb 100644 --- a/internal/repository/neo4j/issue_integration_test.go +++ b/internal/repository/neo4j/issue_integration_test.go @@ -91,24 +91,24 @@ func (s *IssueRepositoryIntegrationTestSuite) TestGet() { s.Assert().Nil(issue.UpdatedAt) } -func (s *IssueRepositoryIntegrationTestSuite) TestGetAllForProject() { +func (s *IssueRepositoryIntegrationTestSuite) TestFindAllForProject() { s.Require().NoError(s.IssueRepo.Create(context.Background(), s.testProject.ID, s.issue)) s.Require().NoError(s.IssueRepo.Create(context.Background(), s.testProject.ID, testModel.NewIssue(s.testUser.ID))) s.Require().NoError(s.IssueRepo.Create(context.Background(), s.testProject.ID, testModel.NewIssue(s.testUser.ID))) - issues, err := s.IssueRepo.GetAllForProject(context.Background(), s.testProject.ID, 0, 10) + issues, err := s.IssueRepo.FindAllForProject(context.Background(), s.testProject.ID, 0, 10) s.Require().NoError(err) s.Assert().Len(issues, 3) - issues, err = s.IssueRepo.GetAllForProject(context.Background(), s.testProject.ID, 1, 2) + issues, err = s.IssueRepo.FindAllForProject(context.Background(), s.testProject.ID, 1, 2) s.Require().NoError(err) s.Assert().Len(issues, 2) - issues, err = s.IssueRepo.GetAllForProject(context.Background(), s.testProject.ID, 2, 2) + issues, err = s.IssueRepo.FindAllForProject(context.Background(), s.testProject.ID, 2, 2) s.Require().NoError(err) s.Assert().Len(issues, 1) - issues, err = s.IssueRepo.GetAllForProject(context.Background(), s.testProject.ID, 3, 2) + issues, err = s.IssueRepo.FindAllForProject(context.Background(), s.testProject.ID, 3, 2) s.Require().NoError(err) s.Assert().Len(issues, 0) } @@ -128,15 +128,15 @@ func (s *IssueRepositoryIntegrationTestSuite) TestGetAllForIssue() { s.Require().NoError(s.IssueRepo.AddRelation(context.Background(), relation)) - issues, err := s.IssueRepo.GetAllForIssue(context.Background(), s.issue.ID, 0, 10) + issues, err := s.IssueRepo.FindAllForIssue(context.Background(), s.issue.ID, 0, 10) s.Require().NoError(err) s.Assert().Len(issues, 2) - issues, err = s.IssueRepo.GetAllForIssue(context.Background(), s.issue.ID, 1, 2) + issues, err = s.IssueRepo.FindAllForIssue(context.Background(), s.issue.ID, 1, 2) s.Require().NoError(err) s.Assert().Len(issues, 1) - issues, err = s.IssueRepo.GetAllForIssue(context.Background(), s.issue.ID, 2, 2) + issues, err = s.IssueRepo.FindAllForIssue(context.Background(), s.issue.ID, 2, 2) s.Require().NoError(err) s.Assert().Len(issues, 0) } diff --git a/internal/repository/neo4j/neo4j.go b/internal/repository/neo4j/neo4j.go index 90f0dcf6..eb72b2fc 100644 --- a/internal/repository/neo4j/neo4j.go +++ b/internal/repository/neo4j/neo4j.go @@ -91,8 +91,8 @@ type Database struct { tracer tracing.Tracer `validate:"required"` } -// GetReadSession returns a "read" session. -func (db *Database) GetReadSession(ctx context.Context) neo4j.SessionWithContext { +// ReadSession returns a "read" session. +func (db *Database) ReadSession(ctx context.Context) neo4j.SessionWithContext { return db.driver.NewSession(ctx, neo4j.SessionConfig{ AccessMode: neo4j.AccessModeRead, DatabaseName: db.name, @@ -100,8 +100,8 @@ func (db *Database) GetReadSession(ctx context.Context) neo4j.SessionWithContext }) } -// GetWriteSession returns a "write" session. -func (db *Database) GetWriteSession(ctx context.Context) neo4j.SessionWithContext { +// WriteSession returns a "write" session. +func (db *Database) WriteSession(ctx context.Context) neo4j.SessionWithContext { return db.driver.NewSession(ctx, neo4j.SessionConfig{ AccessMode: neo4j.AccessModeWrite, DatabaseName: db.name, @@ -271,7 +271,7 @@ func ExecuteAndConsumeResult(ctx context.Context, tx neo4j.ManagedTransaction, q // ExecuteWriteAndConsume executes a query and consumes its result. func ExecuteWriteAndConsume(ctx context.Context, db *Database, query string, params map[string]any) error { - session := db.GetWriteSession(ctx) + session := db.WriteSession(ctx) defer func(ctx context.Context, sess neo4j.SessionWithContext) { err := sess.Close(ctx) if err != nil { @@ -289,7 +289,7 @@ func ExecuteWriteAndConsume(ctx context.Context, db *Database, query string, par // ExecuteReadAndReadSingle executes a query and reads a single result. func ExecuteReadAndReadSingle[T any](ctx context.Context, db *Database, query string, params map[string]any, reader func(record *neo4j.Record) (*T, error)) (*T, error) { - session := db.GetReadSession(ctx) + session := db.ReadSession(ctx) defer func(ctx context.Context, sess neo4j.SessionWithContext) { err := sess.Close(ctx) if err != nil { @@ -317,7 +317,7 @@ func ExecuteReadAndReadSingle[T any](ctx context.Context, db *Database, query st // ExecuteWriteAndReadSingle executes a query and reads a single result. func ExecuteWriteAndReadSingle[T any](ctx context.Context, db *Database, query string, params map[string]any, reader func(record *neo4j.Record) (*T, error)) (*T, error) { - session := db.GetWriteSession(ctx) + session := db.WriteSession(ctx) defer func(ctx context.Context, sess neo4j.SessionWithContext) { err := sess.Close(ctx) if err != nil { @@ -345,7 +345,7 @@ func ExecuteWriteAndReadSingle[T any](ctx context.Context, db *Database, query s // ExecuteReadAndReadAll executes a query and reads all results. func ExecuteReadAndReadAll[T any](ctx context.Context, db *Database, query string, params map[string]any, reader func(record *neo4j.Record) (T, error)) ([]T, error) { - session := db.GetReadSession(ctx) + session := db.ReadSession(ctx) defer func(ctx context.Context, sess neo4j.SessionWithContext) { err := sess.Close(ctx) if err != nil { @@ -382,7 +382,7 @@ func ExecuteReadAndReadAll[T any](ctx context.Context, db *Database, query strin // ExecuteWriteAndReadAll executes a query and reads all results. func ExecuteWriteAndReadAll[T any](ctx context.Context, db *Database, query string, params map[string]any, reader func(record *neo4j.Record) (T, error)) ([]T, error) { - session := db.GetWriteSession(ctx) + session := db.WriteSession(ctx) defer func(ctx context.Context, sess neo4j.SessionWithContext) { err := sess.Close(ctx) if err != nil { diff --git a/internal/repository/neo4j/neo4j_integration_test.go b/internal/repository/neo4j/neo4j_integration_test.go index 83fdf9a5..0a678920 100644 --- a/internal/repository/neo4j/neo4j_integration_test.go +++ b/internal/repository/neo4j/neo4j_integration_test.go @@ -28,13 +28,13 @@ func (s *Neo4jRepositoryIntegrationTestSuite) TearDownSuite() { defer s.CleanupContainers() } -func (s *Neo4jRepositoryIntegrationTestSuite) TestGetReadSession() { - session := s.Neo4jDB.GetReadSession(context.Background()) +func (s *Neo4jRepositoryIntegrationTestSuite) TestReadSession() { + session := s.Neo4jDB.ReadSession(context.Background()) s.Require().NotNil(session) } -func (s *Neo4jRepositoryIntegrationTestSuite) TestGetWriteSession() { - session := s.Neo4jDB.GetWriteSession(context.Background()) +func (s *Neo4jRepositoryIntegrationTestSuite) TestWriteSession() { + session := s.Neo4jDB.WriteSession(context.Background()) s.Require().NotNil(session) } diff --git a/internal/repository/pg/pg.go b/internal/repository/pg/pg.go index 0b428337..d9528b13 100644 --- a/internal/repository/pg/pg.go +++ b/internal/repository/pg/pg.go @@ -115,8 +115,8 @@ func (db *Database) Ping(ctx context.Context) error { return db.pool.Ping(ctx) } -// GetPool returns the database pool. -func (db *Database) GetPool() Pool { +// Pool returns the database pool. +func (db *Database) Pool() Pool { return db.pool } diff --git a/internal/repository/pg/pg_test.go b/internal/repository/pg/pg_test.go index 073cdbfb..3a38c5dd 100644 --- a/internal/repository/pg/pg_test.go +++ b/internal/repository/pg/pg_test.go @@ -276,7 +276,7 @@ func TestDatabase_Close(t *testing.T) { require.NoError(t, db.Close()) } -func TestDatabase_GetPool(t *testing.T) { +func TestDatabase_Pool(t *testing.T) { t.Parallel() pool := new(mock.PGPool) @@ -285,7 +285,7 @@ func TestDatabase_GetPool(t *testing.T) { pool: pool, } - require.Equal(t, pool, db.GetPool()) + require.Equal(t, pool, db.Pool()) } func TestDatabase_Ping(t *testing.T) { diff --git a/internal/repository/redis/assignment.go b/internal/repository/redis/assignment.go index 566b2751..6b820599 100644 --- a/internal/repository/redis/assignment.go +++ b/internal/repository/redis/assignment.go @@ -95,7 +95,7 @@ func (r *CachedAssignmentRepository) Get(ctx context.Context, id model.ID) (*mod return assignment, nil } -func (r *CachedAssignmentRepository) GetByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (r *CachedAssignmentRepository) FindByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { var assignments []*model.Assignment var err error @@ -108,7 +108,7 @@ func (r *CachedAssignmentRepository) GetByUser(ctx context.Context, userID model return assignments, nil } - if assignments, err = r.assignmentRepo.GetByUser(ctx, userID, offset, limit); err != nil { + if assignments, err = r.assignmentRepo.FindByUser(ctx, userID, offset, limit); err != nil { return nil, err } @@ -119,7 +119,7 @@ func (r *CachedAssignmentRepository) GetByUser(ctx context.Context, userID model return assignments, nil } -func (r *CachedAssignmentRepository) GetByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (r *CachedAssignmentRepository) FindByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { var assignments []*model.Assignment var err error @@ -132,7 +132,7 @@ func (r *CachedAssignmentRepository) GetByResource(ctx context.Context, resource return assignments, nil } - if assignments, err = r.assignmentRepo.GetByResource(ctx, resourceID, offset, limit); err != nil { + if assignments, err = r.assignmentRepo.FindByResource(ctx, resourceID, offset, limit); err != nil { return nil, err } diff --git a/internal/repository/redis/assignment_integration_test.go b/internal/repository/redis/assignment_integration_test.go index b748995f..a56d599e 100644 --- a/internal/repository/redis/assignment_integration_test.go +++ b/internal/repository/redis/assignment_integration_test.go @@ -87,40 +87,42 @@ func (s *CachedAssignmentRepositoryIntegrationTestSuite) TestGet() { s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) } -func (s *CachedAssignmentRepositoryIntegrationTestSuite) TestGetByResource() { +// TestFindByResource tests retrieving assignments by resource ID +func (s *CachedAssignmentRepositoryIntegrationTestSuite) TestFindByResource() { s.Require().NoError(s.AssignmentRepo.Create(context.Background(), s.assignment)) s.Require().NoError(s.AssignmentRepo.Create(context.Background(), testModel.NewAssignment(s.testUser.ID, s.testIssue.ID, model.AssignmentKindReviewer))) - originalAssignments, err := s.AssignmentRepo.GetByResource(context.Background(), s.testIssue.ID, 0, 10) + originalAssignments, err := s.AssignmentRepo.FindByResource(context.Background(), s.testIssue.ID, 0, 10) s.Require().NoError(err) - usingCacheAssignments, err := s.assignmentRepo.GetByResource(context.Background(), s.testIssue.ID, 0, 10) + usingCacheAssignments, err := s.assignmentRepo.FindByResource(context.Background(), s.testIssue.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(originalAssignments, usingCacheAssignments) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) - cachedAssignments, err := s.assignmentRepo.GetByResource(context.Background(), s.testIssue.ID, 0, 10) + cachedAssignments, err := s.assignmentRepo.FindByResource(context.Background(), s.testIssue.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(len(usingCacheAssignments), len(cachedAssignments)) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) } -func (s *CachedAssignmentRepositoryIntegrationTestSuite) TestGetByUser() { +// TestFindByUser tests retrieving assignments by user ID +func (s *CachedAssignmentRepositoryIntegrationTestSuite) TestFindByUser() { s.Require().NoError(s.AssignmentRepo.Create(context.Background(), s.assignment)) s.Require().NoError(s.AssignmentRepo.Create(context.Background(), testModel.NewAssignment(s.testUser.ID, s.testIssue.ID, model.AssignmentKindReviewer))) - originalAssignments, err := s.AssignmentRepo.GetByUser(context.Background(), s.testUser.ID, 0, 10) + originalAssignments, err := s.AssignmentRepo.FindByUser(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) - usingCacheAssignments, err := s.assignmentRepo.GetByUser(context.Background(), s.testUser.ID, 0, 10) + usingCacheAssignments, err := s.assignmentRepo.FindByUser(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(originalAssignments, usingCacheAssignments) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) - cachedAssignments, err := s.assignmentRepo.GetByUser(context.Background(), s.testUser.ID, 0, 10) + cachedAssignments, err := s.assignmentRepo.FindByUser(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(len(usingCacheAssignments), len(cachedAssignments)) diff --git a/internal/repository/redis/assignment_test.go b/internal/repository/redis/assignment_test.go index f83ffb52..6125afbd 100644 --- a/internal/repository/redis/assignment_test.go +++ b/internal/repository/redis/assignment_test.go @@ -772,7 +772,7 @@ func TestCachedAssignmentRepository_GetByUser(t *testing.T) { cacheRepo: tt.fields.cacheRepo(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit, tt.want), assignmentRepo: tt.fields.assignmentRepo(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit, tt.want), } - got, err := r.GetByUser(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit) + got, err := r.FindByUser(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit) assert.ErrorIs(t, err, tt.wantErr) assert.ElementsMatch(t, tt.want, got) }) @@ -1037,7 +1037,7 @@ func TestCachedAssignmentRepository_GetByResource(t *testing.T) { cacheRepo: tt.fields.cacheRepo(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit, tt.want), assignmentRepo: tt.fields.assignmentRepo(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit, tt.want), } - got, err := r.GetByResource(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit) + got, err := r.FindByResource(tt.args.ctx, tt.args.userID, tt.args.offset, tt.args.limit) assert.ErrorIs(t, err, tt.wantErr) assert.ElementsMatch(t, tt.want, got) }) diff --git a/internal/repository/redis/cache.go b/internal/repository/redis/cache.go index 8735bb34..00459208 100644 --- a/internal/repository/redis/cache.go +++ b/internal/repository/redis/cache.go @@ -113,7 +113,7 @@ func (r *baseRepository) DeletePattern(ctx context.Context, pattern string) erro ctx, span := r.tracer.Start(ctx, "repository.redis.baseRepository/DeletePattern") defer span.End() - keys, err := r.db.GetClient().Keys(ctx, pattern).Result() + keys, err := r.db.Client().Keys(ctx, pattern).Result() if err != nil && !errors.Is(err, redis.Nil) { return err } @@ -141,7 +141,7 @@ func newBaseRepository(opts ...RepositoryOption) (*baseRepository, error) { } r.cache = cache.New(&cache.Options{ - Redis: r.db.GetClient(), + Redis: r.db.Client(), LocalCache: cache.NewTinyLFU(1000, 1*time.Minute), }) diff --git a/internal/repository/redis/document.go b/internal/repository/redis/document.go index 273bc590..a12ed3fd 100644 --- a/internal/repository/redis/document.go +++ b/internal/repository/redis/document.go @@ -94,11 +94,11 @@ func (r *CachedDocumentRepository) Get(ctx context.Context, id model.ID) (*model return document, nil } -func (r *CachedDocumentRepository) GetByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { +func (r *CachedDocumentRepository) FindByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { var documents []*model.Document var err error - key := composeCacheKey(model.ResourceTypeDocument.String(), "GetByCreator", createdBy.String(), offset, limit) + key := composeCacheKey(model.ResourceTypeDocument.String(), "FindByCreator", createdBy.String(), offset, limit) if err = r.cacheRepo.Get(ctx, key, &documents); err != nil { return nil, err } @@ -107,7 +107,7 @@ func (r *CachedDocumentRepository) GetByCreator(ctx context.Context, createdBy m return documents, nil } - if documents, err = r.documentRepo.GetByCreator(ctx, createdBy, offset, limit); err != nil { + if documents, err = r.documentRepo.FindByCreator(ctx, createdBy, offset, limit); err != nil { return nil, err } diff --git a/internal/repository/redis/document_integration_test.go b/internal/repository/redis/document_integration_test.go index b6f5399b..c6f01126 100644 --- a/internal/repository/redis/document_integration_test.go +++ b/internal/repository/redis/document_integration_test.go @@ -85,20 +85,20 @@ func (s *CachedDocumentRepositoryIntegrationTestSuite) TestGet() { s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) } -func (s *CachedDocumentRepositoryIntegrationTestSuite) TestGetByCreator() { +func (s *CachedDocumentRepositoryIntegrationTestSuite) TestFindByCreator() { s.Require().NoError(s.DocumentRepo.Create(context.Background(), s.testUser.ID, s.document)) s.Require().NoError(s.DocumentRepo.Create(context.Background(), s.testUser.ID, testModel.NewDocument(s.testUser.ID))) - originalDocuments, err := s.DocumentRepo.GetByCreator(context.Background(), s.testUser.ID, 0, 10) + originalDocuments, err := s.DocumentRepo.FindByCreator(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) - usingCacheDocuments, err := s.documentRepo.GetByCreator(context.Background(), s.testUser.ID, 0, 10) + usingCacheDocuments, err := s.documentRepo.FindByCreator(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(originalDocuments, usingCacheDocuments) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) - cachedDocuments, err := s.documentRepo.GetByCreator(context.Background(), s.testUser.ID, 0, 10) + cachedDocuments, err := s.documentRepo.FindByCreator(context.Background(), s.testUser.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(len(usingCacheDocuments), len(cachedDocuments)) diff --git a/internal/repository/redis/document_test.go b/internal/repository/redis/document_test.go index 05a90cd3..dae936e5 100644 --- a/internal/repository/redis/document_test.go +++ b/internal/repository/redis/document_test.go @@ -1064,7 +1064,7 @@ func TestCachedDocumentRepository_GetByCreator(t *testing.T) { cacheRepo: tt.fields.cacheRepo(tt.args.ctx, tt.args.createdBy, tt.args.offset, tt.args.limit, tt.want), documentRepo: tt.fields.documentRepo(tt.args.ctx, tt.args.createdBy, tt.args.offset, tt.args.limit, tt.want), } - got, err := r.GetByCreator(tt.args.ctx, tt.args.createdBy, tt.args.offset, tt.args.limit) + got, err := r.FindByCreator(tt.args.ctx, tt.args.createdBy, tt.args.offset, tt.args.limit) assert.ErrorIs(t, err, tt.wantErr) assert.ElementsMatch(t, tt.want, got) }) diff --git a/internal/repository/redis/issue.go b/internal/repository/redis/issue.go index 70988a88..14ab602d 100644 --- a/internal/repository/redis/issue.go +++ b/internal/repository/redis/issue.go @@ -102,11 +102,11 @@ func (r *CachedIssueRepository) Get(ctx context.Context, id model.ID) (*model.Is return issue, nil } -func (r *CachedIssueRepository) GetAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { +func (r *CachedIssueRepository) FindAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { var issues []*model.Issue var err error - key := composeCacheKey(model.ResourceTypeIssue.String(), "GetAllForProject", projectID.String(), offset, limit) + key := composeCacheKey(model.ResourceTypeIssue.String(), "FindAllForProject", projectID.String(), offset, limit) if err = r.cacheRepo.Get(ctx, key, &issues); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (r *CachedIssueRepository) GetAllForProject(ctx context.Context, projectID return issues, nil } - if issues, err = r.issueRepo.GetAllForProject(ctx, projectID, offset, limit); err != nil { + if issues, err = r.issueRepo.FindAllForProject(ctx, projectID, offset, limit); err != nil { return nil, err } @@ -126,7 +126,7 @@ func (r *CachedIssueRepository) GetAllForProject(ctx context.Context, projectID return issues, nil } -func (r *CachedIssueRepository) GetAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { +func (r *CachedIssueRepository) FindAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { var issues []*model.Issue var err error @@ -139,7 +139,7 @@ func (r *CachedIssueRepository) GetAllForIssue(ctx context.Context, issueID mode return issues, nil } - if issues, err = r.issueRepo.GetAllForIssue(ctx, issueID, offset, limit); err != nil { + if issues, err = r.issueRepo.FindAllForIssue(ctx, issueID, offset, limit); err != nil { return nil, err } diff --git a/internal/repository/redis/issue_integration_test.go b/internal/repository/redis/issue_integration_test.go index e7c2496b..20eaec37 100644 --- a/internal/repository/redis/issue_integration_test.go +++ b/internal/repository/redis/issue_integration_test.go @@ -99,20 +99,20 @@ func (s *CachedIssueRepositoryIntegrationTestSuite) TestGet() { s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) } -func (s *CachedIssueRepositoryIntegrationTestSuite) TestGetAllForProject() { +func (s *CachedIssueRepositoryIntegrationTestSuite) TestFindAllForProject() { s.Require().NoError(s.IssueRepo.Create(context.Background(), s.testProject.ID, s.issue)) s.Require().NoError(s.IssueRepo.Create(context.Background(), s.testProject.ID, testModel.NewIssue(s.testUser.ID))) - originalIssues, err := s.IssueRepo.GetAllForProject(context.Background(), s.testProject.ID, 0, 10) + originalIssues, err := s.IssueRepo.FindAllForProject(context.Background(), s.testProject.ID, 0, 10) s.Require().NoError(err) - usingCacheIssues, err := s.issueRepo.GetAllForProject(context.Background(), s.testProject.ID, 0, 10) + usingCacheIssues, err := s.issueRepo.FindAllForProject(context.Background(), s.testProject.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(originalIssues, usingCacheIssues) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) - cachedIssues, err := s.issueRepo.GetAllForProject(context.Background(), s.testProject.ID, 0, 10) + cachedIssues, err := s.issueRepo.FindAllForProject(context.Background(), s.testProject.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(len(usingCacheIssues), len(cachedIssues)) @@ -134,16 +134,16 @@ func (s *CachedIssueRepositoryIntegrationTestSuite) TestGetAllForIssue() { s.Require().NoError(s.IssueRepo.AddRelation(context.Background(), relation)) - originalIssues, err := s.IssueRepo.GetAllForIssue(context.Background(), s.issue.ID, 0, 10) + originalIssues, err := s.IssueRepo.FindAllForIssue(context.Background(), s.issue.ID, 0, 10) s.Require().NoError(err) - usingCacheIssues, err := s.issueRepo.GetAllForIssue(context.Background(), s.issue.ID, 0, 10) + usingCacheIssues, err := s.issueRepo.FindAllForIssue(context.Background(), s.issue.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(originalIssues, usingCacheIssues) s.Assert().Len(s.GetKeys(&s.ContainerIntegrationTestSuite, "*"), 1) - cachedIssues, err := s.issueRepo.GetAllForIssue(context.Background(), s.issue.ID, 0, 10) + cachedIssues, err := s.issueRepo.FindAllForIssue(context.Background(), s.issue.ID, 0, 10) s.Require().NoError(err) s.Assert().Equal(len(usingCacheIssues), len(cachedIssues)) diff --git a/internal/repository/redis/issue_test.go b/internal/repository/redis/issue_test.go index 78e11d34..e65f0c50 100644 --- a/internal/repository/redis/issue_test.go +++ b/internal/repository/redis/issue_test.go @@ -1057,7 +1057,7 @@ func TestCachedIssueRepository_GetAllForProject(t *testing.T) { cacheRepo: tt.fields.cacheRepo(tt.args.ctx, tt.args.project, tt.args.offset, tt.args.limit, tt.want), issueRepo: tt.fields.issueRepo(tt.args.ctx, tt.args.project, tt.args.offset, tt.args.limit, tt.want), } - got, err := r.GetAllForProject(tt.args.ctx, tt.args.project, tt.args.offset, tt.args.limit) + got, err := r.FindAllForProject(tt.args.ctx, tt.args.project, tt.args.offset, tt.args.limit) require.ErrorIs(t, err, tt.wantErr) require.ElementsMatch(t, tt.want, got) }) @@ -1374,7 +1374,7 @@ func TestCachedIssueRepository_GetAllForIssue(t *testing.T) { cacheRepo: tt.fields.cacheRepo(tt.args.ctx, tt.args.issue, tt.args.offset, tt.args.limit, tt.want), issueRepo: tt.fields.issueRepo(tt.args.ctx, tt.args.issue, tt.args.offset, tt.args.limit, tt.want), } - got, err := r.GetAllForIssue(tt.args.ctx, tt.args.issue, tt.args.offset, tt.args.limit) + got, err := r.FindAllForIssue(tt.args.ctx, tt.args.issue, tt.args.offset, tt.args.limit) require.ErrorIs(t, err, tt.wantErr) require.ElementsMatch(t, tt.want, got) }) diff --git a/internal/repository/redis/redis.go b/internal/repository/redis/redis.go index b167d037..ca701ed1 100644 --- a/internal/repository/redis/redis.go +++ b/internal/repository/redis/redis.go @@ -99,8 +99,8 @@ type Database struct { tracer tracing.Tracer `validate:"required"` } -// GetClient returns the database client. -func (db *Database) GetClient() redis.UniversalClient { +// Client returns the database client. +func (db *Database) Client() redis.UniversalClient { return db.client } diff --git a/internal/repository/redis/redis_test.go b/internal/repository/redis/redis_test.go index cb083a28..c2b7f38a 100644 --- a/internal/repository/redis/redis_test.go +++ b/internal/repository/redis/redis_test.go @@ -243,7 +243,7 @@ func TestNewDatabase(t *testing.T) { } } -func TestDatabase_GetClient(t *testing.T) { +func TestDatabase_Client(t *testing.T) { t.Parallel() client := new(mock.RedisClient) @@ -252,7 +252,7 @@ func TestDatabase_GetClient(t *testing.T) { client: client, } - require.Equal(t, client, db.GetClient()) + require.Equal(t, client, db.Client()) } func TestDatabase_Close(t *testing.T) { diff --git a/internal/testutil/mock/assignment_repo.go b/internal/testutil/mock/assignment_repo.go index 4ff70e6c..14e9e668 100644 --- a/internal/testutil/mock/assignment_repo.go +++ b/internal/testutil/mock/assignment_repo.go @@ -25,7 +25,7 @@ func (a *AssignmentRepository) Get(ctx context.Context, id model.ID) (*model.Ass return args.Get(0).(*model.Assignment), args.Error(1) } -func (a *AssignmentRepository) GetByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (a *AssignmentRepository) FindByUser(ctx context.Context, userID model.ID, offset, limit int) ([]*model.Assignment, error) { args := a.Called(ctx, userID, offset, limit) if args.Get(0) == nil { return nil, args.Error(1) @@ -33,7 +33,7 @@ func (a *AssignmentRepository) GetByUser(ctx context.Context, userID model.ID, o return args.Get(0).([]*model.Assignment), args.Error(1) } -func (a *AssignmentRepository) GetByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { +func (a *AssignmentRepository) FindByResource(ctx context.Context, resourceID model.ID, offset, limit int) ([]*model.Assignment, error) { args := a.Called(ctx, resourceID, offset, limit) if args.Get(0) == nil { return nil, args.Error(1) diff --git a/internal/testutil/mock/document_repo.go b/internal/testutil/mock/document_repo.go index b628f78f..4b0a7111 100644 --- a/internal/testutil/mock/document_repo.go +++ b/internal/testutil/mock/document_repo.go @@ -25,7 +25,7 @@ func (d *DocumentRepository) Get(ctx context.Context, id model.ID) (*model.Docum return args.Get(0).(*model.Document), args.Error(1) } -func (d *DocumentRepository) GetByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { +func (d *DocumentRepository) FindByCreator(ctx context.Context, createdBy model.ID, offset, limit int) ([]*model.Document, error) { args := d.Called(ctx, createdBy, offset, limit) if args.Get(0) == nil { return nil, args.Error(1) diff --git a/internal/testutil/mock/issue_repo.go b/internal/testutil/mock/issue_repo.go index baf4e92f..17c9abc6 100644 --- a/internal/testutil/mock/issue_repo.go +++ b/internal/testutil/mock/issue_repo.go @@ -25,7 +25,7 @@ func (i *IssueRepository) Get(ctx context.Context, id model.ID) (*model.Issue, e return args.Get(0).(*model.Issue), args.Error(1) } -func (i *IssueRepository) GetAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { +func (i *IssueRepository) FindAllForProject(ctx context.Context, projectID model.ID, offset, limit int) ([]*model.Issue, error) { args := i.Called(ctx, projectID, offset, limit) if args.Get(0) == nil { return nil, args.Error(1) @@ -33,7 +33,7 @@ func (i *IssueRepository) GetAllForProject(ctx context.Context, projectID model. return args.Get(0).([]*model.Issue), args.Error(1) } -func (i *IssueRepository) GetAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { +func (i *IssueRepository) FindAllForIssue(ctx context.Context, issueID model.ID, offset, limit int) ([]*model.Issue, error) { args := i.Called(ctx, issueID, offset, limit) if args.Get(0) == nil { return nil, args.Error(1) diff --git a/internal/testutil/mock/neo4j.go b/internal/testutil/mock/neo4j.go index 1a24902d..f2fbf821 100644 --- a/internal/testutil/mock/neo4j.go +++ b/internal/testutil/mock/neo4j.go @@ -106,12 +106,12 @@ type Neo4jStore struct { mock.Mock } -func (n *Neo4jStore) GetReadSession(ctx context.Context) any { +func (n *Neo4jStore) ReadSession(ctx context.Context) any { args := n.Called(ctx) return args.Get(0) } -func (n *Neo4jStore) GetWriteSession(ctx context.Context) any { +func (n *Neo4jStore) WriteSession(ctx context.Context) any { args := n.Called(ctx) return args.Get(0) } diff --git a/internal/testutil/repository/repository.go b/internal/testutil/repository/repository.go index e914f743..3d7dda18 100644 --- a/internal/testutil/repository/repository.go +++ b/internal/testutil/repository/repository.go @@ -45,7 +45,7 @@ func BootstrapNeo4jDatabase(ctx context.Context, t *testing.T, db *neo4j.Databas for _, statement := range statements { statement = strings.TrimSpace(statement) if statement != "" { - _, err := db.GetWriteSession(ctx).Run(ctx, statement, nil) + _, err := db.WriteSession(ctx).Run(ctx, statement, nil) if err != nil { t.Log(statement) } @@ -56,7 +56,7 @@ func BootstrapNeo4jDatabase(ctx context.Context, t *testing.T, db *neo4j.Databas // CleanupNeo4jStore deletes all nodes and relationships from the database. func CleanupNeo4jStore(ctx context.Context, t *testing.T, db *neo4j.Database) { - _, err := db.GetWriteSession(ctx).Run(ctx, "MATCH (n) WHERE n.system IS NULL OR n.system = false DETACH DELETE n", nil) + _, err := db.WriteSession(ctx).Run(ctx, "MATCH (n) WHERE n.system IS NULL OR n.system = false DETACH DELETE n", nil) require.NoError(t, err) } @@ -83,7 +83,7 @@ func BootstrapPgDatabase(ctx context.Context, t *testing.T, db *pg.Database) { for _, statement := range statements { statement = strings.TrimSpace(statement) if statement != "" { - _, err := db.GetPool().Exec(ctx, statement) + _, err := db.Pool().Exec(ctx, statement) if err != nil { t.Log(statement) } @@ -93,7 +93,7 @@ func BootstrapPgDatabase(ctx context.Context, t *testing.T, db *pg.Database) { } func CleanupPgStore(ctx context.Context, t *testing.T, db *pg.Database) { - _, err := db.GetPool().Exec(ctx, ` + _, err := db.Pool().Exec(ctx, ` DO $$ DECLARE table_name text; BEGIN FOR table_name IN (SELECT tablename FROM pg_tables WHERE schemaname='etl') LOOP @@ -121,6 +121,6 @@ func NewRedisDatabase(t *testing.T, conf *config.CacheDatabaseConfig) (*redis.Da // CleanupRedisStore deletes all keys from the database. func CleanupRedisStore(ctx context.Context, t *testing.T, db *redis.Database) { - err := db.GetClient().FlushDB(ctx).Err() + err := db.Client().FlushDB(ctx).Err() require.NoError(t, err) } diff --git a/internal/testutil/repository/user.go b/internal/testutil/repository/user.go index 6d17ecfb..6a94a787 100644 --- a/internal/testutil/repository/user.go +++ b/internal/testutil/repository/user.go @@ -23,7 +23,7 @@ func MakeUserSystemOwner(userID model.ID, db *neo4j.Database) error { "perm_kind": model.PermissionKindAll.String(), } - _, err := db.GetWriteSession(ctx).Run(ctx, cypher, params) + _, err := db.WriteSession(ctx).Run(ctx, cypher, params) if err != nil { return err } diff --git a/internal/testutil/service/user.go b/internal/testutil/service/user.go index 6fed6b19..f8bd25a0 100644 --- a/internal/testutil/service/user.go +++ b/internal/testutil/service/user.go @@ -80,7 +80,7 @@ func NewResourceOwner(t *testing.T, neo4jDBConf *config.GraphDatabaseConfig) *mo "perm_kind": model.PermissionKindAll.String(), } - _, err = neo4jDB.GetWriteSession(context.Background()).Run(context.Background(), cypher, params) + _, err = neo4jDB.WriteSession(context.Background()).Run(context.Background(), cypher, params) require.NoError(t, err) return owner diff --git a/internal/testutil/testsuite.go b/internal/testutil/testsuite.go index c53b3ed3..63a6be50 100644 --- a/internal/testutil/testsuite.go +++ b/internal/testutil/testsuite.go @@ -173,7 +173,7 @@ func (s *RedisContainerIntegrationTestSuite) CleanupRedis(ts *ContainerIntegrati } func (s *RedisContainerIntegrationTestSuite) GetKeys(ts *ContainerIntegrationTestSuite, pattern string) []string { - keys, err := s.RedisDB.GetClient().Keys(context.Background(), pattern).Result() + keys, err := s.RedisDB.Client().Keys(context.Background(), pattern).Result() ts.Require().NoError(err) return keys } diff --git a/internal/transport/http/notification.go b/internal/transport/http/notification.go index 68324329..7d3ff709 100644 --- a/internal/transport/http/notification.go +++ b/internal/transport/http/notification.go @@ -65,8 +65,8 @@ func (c *notificationController) V1NotificationsGet(ctx context.Context, request notifications, err := c.notificationService.GetAllByRecipient(ctx, recipientID, - pkg.GetDefaultPtr(request.Params.Offset, DefaultOffset), - pkg.GetDefaultPtr(request.Params.Limit, DefaultLimit), + pkg.RenderDefaultPtr(request.Params.Offset, DefaultOffset), + pkg.RenderDefaultPtr(request.Params.Limit, DefaultLimit), ) if err != nil { if errors.Is(err, service.ErrNoPermission) { diff --git a/internal/transport/http/organization.go b/internal/transport/http/organization.go index 06a0e264..e04eea32 100644 --- a/internal/transport/http/organization.go +++ b/internal/transport/http/organization.go @@ -99,8 +99,8 @@ func (c *organizationController) V1OrganizationsGet(ctx context.Context, request defer span.End() organizations, err := c.organizationService.GetAll(ctx, - pkg.GetDefaultPtr(request.Params.Offset, DefaultOffset), - pkg.GetDefaultPtr(request.Params.Limit, DefaultLimit), + pkg.RenderDefaultPtr(request.Params.Offset, DefaultOffset), + pkg.RenderDefaultPtr(request.Params.Limit, DefaultLimit), ) if err != nil { if errors.Is(err, service.ErrNoPermission) { @@ -158,7 +158,7 @@ func (c *organizationController) V1OrganizationDelete(ctx context.Context, reque return api.V1OrganizationDelete400JSONResponse{N400JSONResponse: badRequest}, nil } - if err := c.organizationService.Delete(ctx, organizationID, pkg.GetDefaultPtr(request.Params.Force, false)); err != nil { + if err := c.organizationService.Delete(ctx, organizationID, pkg.RenderDefaultPtr(request.Params.Force, false)); err != nil { if errors.Is(err, repository.ErrNotFound) { return api.V1OrganizationDelete404JSONResponse{N404JSONResponse: notFound}, nil } @@ -282,7 +282,7 @@ func (c *organizationController) V1OrganizationRolesCreate(ctx context.Context, return api.V1OrganizationRolesCreate400JSONResponse{N400JSONResponse: badRequest}, nil } - role.Description = pkg.GetDefaultPtr(request.Body.Description, "") + role.Description = pkg.RenderDefaultPtr(request.Body.Description, "") if err := c.roleService.Create(ctx, ownedBy, organizationID, role); err != nil { if errors.Is(err, service.ErrNoPermission) { @@ -312,8 +312,8 @@ func (c *organizationController) V1OrganizationRolesGet(ctx context.Context, req roles, err := c.roleService.GetAllBelongsTo(ctx, organizationID, - pkg.GetDefaultPtr(request.Params.Offset, DefaultOffset), - pkg.GetDefaultPtr(request.Params.Limit, DefaultLimit), + pkg.RenderDefaultPtr(request.Params.Offset, DefaultOffset), + pkg.RenderDefaultPtr(request.Params.Limit, DefaultLimit), ) if err != nil { if errors.Is(err, service.ErrNoPermission) { diff --git a/internal/transport/http/todo.go b/internal/transport/http/todo.go index c541d2f9..a46d0ede 100644 --- a/internal/transport/http/todo.go +++ b/internal/transport/http/todo.go @@ -90,8 +90,8 @@ func (c *todoController) V1TodosGet(ctx context.Context, request api.V1TodosGetR defer span.End() todos, err := c.todoService.GetAll(ctx, - pkg.GetDefaultPtr(request.Params.Offset, DefaultOffset), - pkg.GetDefaultPtr(request.Params.Limit, DefaultLimit), + pkg.RenderDefaultPtr(request.Params.Offset, DefaultOffset), + pkg.RenderDefaultPtr(request.Params.Limit, DefaultLimit), request.Params.Completed, ) if err != nil { @@ -193,7 +193,7 @@ func createTodoJSONRequestBodyToTodo(body *api.V1TodosCreateJSONRequestBody, own return nil, err } - todo.Description = pkg.GetDefaultPtr(body.Description.Value, "") + todo.Description = pkg.RenderDefaultPtr(body.Description.Value, "") if body.DueDate.Value != nil { todo.DueDate = *body.DueDate.Value diff --git a/internal/transport/http/user.go b/internal/transport/http/user.go index 0af2bc24..4e05f9aa 100644 --- a/internal/transport/http/user.go +++ b/internal/transport/http/user.go @@ -92,7 +92,7 @@ func (c *userController) V1UsersGet(ctx context.Context, request api.V1UsersGetR ctx, span := c.tracer.Start(ctx, "transport.http.handler/V1UsersGet") defer span.End() - users, err := c.userService.GetAll(ctx, pkg.GetDefaultPtr(request.Params.Offset, DefaultOffset), pkg.GetDefaultPtr(request.Params.Limit, DefaultLimit)) + users, err := c.userService.GetAll(ctx, pkg.RenderDefaultPtr(request.Params.Offset, DefaultOffset), pkg.RenderDefaultPtr(request.Params.Limit, DefaultLimit)) if err != nil { if errors.Is(err, service.ErrNoPermission) { return api.V1UsersGet403JSONResponse{N403JSONResponse: permissionDenied}, nil @@ -186,7 +186,7 @@ func (c *userController) V1UserDelete(ctx context.Context, request api.V1UserDel return api.V1UserDelete404JSONResponse{N404JSONResponse: notFound}, nil } - if err := c.userService.Delete(ctx, userID, pkg.GetDefaultPtr(request.Params.Force, false)); err != nil { + if err := c.userService.Delete(ctx, userID, pkg.RenderDefaultPtr(request.Params.Force, false)); err != nil { if errors.Is(err, service.ErrNoPermission) { return api.V1UserDelete403JSONResponse{N403JSONResponse: permissionDenied}, nil } @@ -225,14 +225,14 @@ func createUserJSONRequestBodyToUser(body *api.V1UsersCreateJSONRequestBody) (*m return nil, err } - user.FirstName = pkg.GetDefaultPtr(body.FirstName, "") - user.LastName = pkg.GetDefaultPtr(body.LastName, "") - user.Title = pkg.GetDefaultPtr(body.Title, "") - user.Picture = pkg.GetDefaultPtr(body.Picture, "") - user.Bio = pkg.GetDefaultPtr(body.Bio, "") - user.Address = pkg.GetDefaultPtr(body.Address, "") - user.Phone = pkg.GetDefaultPtr(body.Phone, "") - user.Links = pkg.GetDefaultPtr(body.Links, make([]string, 0)) + user.FirstName = pkg.RenderDefaultPtr(body.FirstName, "") + user.LastName = pkg.RenderDefaultPtr(body.LastName, "") + user.Title = pkg.RenderDefaultPtr(body.Title, "") + user.Picture = pkg.RenderDefaultPtr(body.Picture, "") + user.Bio = pkg.RenderDefaultPtr(body.Bio, "") + user.Address = pkg.RenderDefaultPtr(body.Address, "") + user.Phone = pkg.RenderDefaultPtr(body.Phone, "") + user.Links = pkg.RenderDefaultPtr(body.Links, make([]string, 0)) if body.Languages != nil { user.Languages = make([]model.Language, len(*body.Languages))