mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2025-08-03 16:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup unnecessary calls

Browse source
This commit is contained in:
Hayden 2023-08-02 15:06:46 -05:00
parent b53e4cf524
commit 1df47ef668
No known key found for this signature in database
GPG key ID: 17CF79474E257545
5 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/internal/data/repo/repo_items_test.go
View file

@ -39,7 +39,7 @@ func useItems(t *testing.T, len int) []ItemOut {
_ = tRepos.Items.Delete(context.Background(), item.ID) _ = tRepos.Items.Delete(context.Background(), item.ID)
} }
_ = tRepos.Locations.Delete(context.Background(), location.ID) _ = tRepos.Locations.delete(context.Background(), location.ID)
}) })
return items return items
@ -123,7 +123,7 @@ func TestItemsRepository_Create(t *testing.T) {
assert.NotEmpty(t, result.ID) assert.NotEmpty(t, result.ID)
// Cleanup - Also deletes item // Cleanup - Also deletes item
err = tRepos.Locations.Delete(context.Background(), location.ID) err = tRepos.Locations.delete(context.Background(), location.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -147,7 +147,7 @@ func TestItemsRepository_Create_Location(t *testing.T) {
assert.Equal(t, location.ID, foundItem.Location.ID) assert.Equal(t, location.ID, foundItem.Location.ID)
// Cleanup - Also deletes item // Cleanup - Also deletes item
err = tRepos.Locations.Delete(context.Background(), location.ID) err = tRepos.Locations.delete(context.Background(), location.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }

13
backend/internal/data/repo/repo_labels.go
View file

@ -131,15 +131,6 @@ func (r *LabelRepository) update(ctx context.Context, data LabelUpdate, where ..
Save(ctx) Save(ctx)
} }
func (r *LabelRepository) Update(ctx context.Context, data LabelUpdate) (LabelOut, error) {
_, err := r.update(ctx, data, label.ID(data.ID))
if err != nil {
return LabelOut{}, err
}
return r.GetOne(ctx, data.ID)
}
func (r *LabelRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data LabelUpdate) (LabelOut, error) { func (r *LabelRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data LabelUpdate) (LabelOut, error) {
_, err := r.update(ctx, data, label.ID(data.ID), label.HasGroupWith(group.ID(GID))) _, err := r.update(ctx, data, label.ID(data.ID), label.HasGroupWith(group.ID(GID)))
if err != nil { if err != nil {
@ -150,7 +141,9 @@ func (r *LabelRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data
return r.GetOne(ctx, data.ID) return r.GetOne(ctx, data.ID)
} }
func (r *LabelRepository) Delete(ctx context.Context, id uuid.UUID) error { // delete removes the label from the database. This should only be used when
// the label's ownership is already confirmed/validated.
func (r *LabelRepository) delete(ctx context.Context, id uuid.UUID) error {
return r.db.Label.DeleteOneID(id).Exec(ctx) return r.db.Label.DeleteOneID(id).Exec(ctx)
} }

10
backend/internal/data/repo/repo_labels_test.go
View file

@ -28,7 +28,7 @@ func useLabels(t *testing.T, len int) []LabelOut {
t.Cleanup(func() { t.Cleanup(func() {
for _, item := range labels { for _, item := range labels {
_ = tRepos.Labels.Delete(context.Background(), item.ID) _ = tRepos.Labels.delete(context.Background(), item.ID)
} }
}) })
@ -62,7 +62,7 @@ func TestLabelRepository_Create(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, loc.ID, foundLoc.ID) assert.Equal(t, loc.ID, foundLoc.ID)
err = tRepos.Labels.Delete(context.Background(), loc.ID) err = tRepos.Labels.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -76,7 +76,7 @@ func TestLabelRepository_Update(t *testing.T) {
Description: fk.Str(100), Description: fk.Str(100),
} }
update, err := tRepos.Labels.Update(context.Background(), updateData) update, err := tRepos.Labels.UpdateByGroup(context.Background(), tGroup.ID, updateData)
assert.NoError(t, err) assert.NoError(t, err)
foundLoc, err := tRepos.Labels.GetOne(context.Background(), loc.ID) foundLoc, err := tRepos.Labels.GetOne(context.Background(), loc.ID)
@ -86,7 +86,7 @@ func TestLabelRepository_Update(t *testing.T) {
assert.Equal(t, update.Name, foundLoc.Name) assert.Equal(t, update.Name, foundLoc.Name)
assert.Equal(t, update.Description, foundLoc.Description) assert.Equal(t, update.Description, foundLoc.Description)
err = tRepos.Labels.Delete(context.Background(), loc.ID) err = tRepos.Labels.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -94,7 +94,7 @@ func TestLabelRepository_Delete(t *testing.T) {
loc, err := tRepos.Labels.Create(context.Background(), tGroup.ID, labelFactory()) loc, err := tRepos.Labels.Create(context.Background(), tGroup.ID, labelFactory())
assert.NoError(t, err) assert.NoError(t, err)
err = tRepos.Labels.Delete(context.Background(), loc.ID) err = tRepos.Labels.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
_, err = tRepos.Labels.GetOne(context.Background(), loc.ID) _, err = tRepos.Labels.GetOne(context.Background(), loc.ID)

8
backend/internal/data/repo/repo_locations.go
View file

@ -222,10 +222,6 @@ func (r *LocationRepository) update(ctx context.Context, data LocationUpdate, wh
return r.Get(ctx, data.ID) return r.Get(ctx, data.ID)
} }
func (r *LocationRepository) Update(ctx context.Context, data LocationUpdate) (LocationOut, error) {
return r.update(ctx, data, location.ID(data.ID))
}
func (r *LocationRepository) UpdateByGroup(ctx context.Context, GID, ID uuid.UUID, data LocationUpdate) (LocationOut, error) { func (r *LocationRepository) UpdateByGroup(ctx context.Context, GID, ID uuid.UUID, data LocationUpdate) (LocationOut, error) {
v, err := r.update(ctx, data, location.ID(ID), location.HasGroupWith(group.ID(GID))) v, err := r.update(ctx, data, location.ID(ID), location.HasGroupWith(group.ID(GID)))
if err != nil { if err != nil {
@ -236,7 +232,9 @@ func (r *LocationRepository) UpdateByGroup(ctx context.Context, GID, ID uuid.UUI
return v, err return v, err
} }
func (r *LocationRepository) Delete(ctx context.Context, ID uuid.UUID) error { // delete should only be used after checking that the location is owned by the
// group. Otherwise, use DeleteByGroup
func (r *LocationRepository) delete(ctx context.Context, ID uuid.UUID) error {
return r.db.Location.DeleteOneID(ID).Exec(ctx) return r.db.Location.DeleteOneID(ID).Exec(ctx)
} }

12
backend/internal/data/repo/repo_locations_test.go
View file

@ -30,7 +30,7 @@ func useLocations(t *testing.T, len int) []LocationOut {
t.Cleanup(func() { t.Cleanup(func() {
for _, loc := range out { for _, loc := range out {
err := tRepos.Locations.Delete(context.Background(), loc.ID) err := tRepos.Locations.delete(context.Background(), loc.ID)
if err != nil { if err != nil {
assert.True(t, ent.IsNotFound(err)) assert.True(t, ent.IsNotFound(err))
} }
@ -49,7 +49,7 @@ func TestLocationRepository_Get(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, loc.ID, foundLoc.ID) assert.Equal(t, loc.ID, foundLoc.ID)
err = tRepos.Locations.Delete(context.Background(), loc.ID) err = tRepos.Locations.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -83,7 +83,7 @@ func TestLocationRepository_Create(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, loc.ID, foundLoc.ID) assert.Equal(t, loc.ID, foundLoc.ID)
err = tRepos.Locations.Delete(context.Background(), loc.ID) err = tRepos.Locations.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -96,7 +96,7 @@ func TestLocationRepository_Update(t *testing.T) {
Description: fk.Str(100), Description: fk.Str(100),
} }
update, err := tRepos.Locations.Update(context.Background(), updateData) update, err := tRepos.Locations.UpdateByGroup(context.Background(), tGroup.ID, updateData.ID, updateData)
assert.NoError(t, err) assert.NoError(t, err)
foundLoc, err := tRepos.Locations.Get(context.Background(), loc.ID) foundLoc, err := tRepos.Locations.Get(context.Background(), loc.ID)
@ -106,14 +106,14 @@ func TestLocationRepository_Update(t *testing.T) {
assert.Equal(t, update.Name, foundLoc.Name) assert.Equal(t, update.Name, foundLoc.Name)
assert.Equal(t, update.Description, foundLoc.Description) assert.Equal(t, update.Description, foundLoc.Description)
err = tRepos.Locations.Delete(context.Background(), loc.ID) err = tRepos.Locations.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
} }
func TestLocationRepository_Delete(t *testing.T) { func TestLocationRepository_Delete(t *testing.T) {
loc := useLocations(t, 1)[0] loc := useLocations(t, 1)[0]
err := tRepos.Locations.Delete(context.Background(), loc.ID) err := tRepos.Locations.delete(context.Background(), loc.ID)
assert.NoError(t, err) assert.NoError(t, err)
_, err = tRepos.Locations.Get(context.Background(), loc.ID) _, err = tRepos.Locations.Get(context.Background(), loc.ID)