Skip to content

Commit

Permalink
Merge pull request #17 from NorskHelsenett/feature/standardize-the-us…
Browse files Browse the repository at this point in the history
…e-of-the-401/403-http-status-codes

Feature/standardize the use of the 40x http status codes
  • Loading branch information
havardelnan authored Jan 27, 2025
2 parents 26f6d32 + ff330e9 commit 2ab9870
Show file tree
Hide file tree
Showing 61 changed files with 3,499 additions and 1,832 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/NorskHelsenett/ror-api
go 1.23.1

require (
github.com/NorskHelsenett/ror v1.1.0-rc1
github.com/NorskHelsenett/ror v1.1.0-rc2
github.com/blang/semver/v4 v4.0.0
github.com/coreos/go-oidc/v3 v3.12.0
github.com/dotse/go-health v0.2.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5g
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
github.com/NorskHelsenett/ror v1.1.0-rc1 h1:zuuMdECjwhOgZw9PlCBu7GDoVkeG+Rs69CpGLbxxjPU=
github.com/NorskHelsenett/ror v1.1.0-rc1/go.mod h1:pvL3e/ga+PNW4sYH6uJt2btJ/k/2H1wAIYTxolJ3ZCU=
github.com/NorskHelsenett/ror v1.1.0-rc2 h1:kJI1lv998ziPB++LBeNAsNrKMgiZPh+fQwD8dfCA+uA=
github.com/NorskHelsenett/ror v1.1.0-rc2/go.mod h1:pvL3e/ga+PNW4sYH6uJt2btJ/k/2H1wAIYTxolJ3ZCU=
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down
4 changes: 2 additions & 2 deletions internal/acl/repositories/aclCRUD.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ func GetByFilter(ctx context.Context, filter *apicontracts.Filter) ([]aclmodels.

totalCountResult, err := collection.Aggregate(ctx, totalCountPipeline)
if err != nil {
return nil, 0, fmt.Errorf("could not fetch acl: %v", err)
return nil, 0, fmt.Errorf("Could not get acl: %v", err)
}

var totalCountAcc []bson.M
if err = totalCountResult.All(ctx, &totalCountAcc); err != nil {
return nil, 0, fmt.Errorf("could not fetch total count for acl: %v", err)
return nil, 0, fmt.Errorf("Could not get total count for acl: %v", err)
}

totalCount := len(totalCountAcc)
Expand Down
10 changes: 5 additions & 5 deletions internal/apiservices/datacentersService/datacenters_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
func GetAllByUser(ctx context.Context) (*[]apicontracts.Datacenter, error) {
datacenters, err := datacentersRepo.GetAllByUser(ctx)
if err != nil {
return nil, errors.New("could not fetch datacenters")
return nil, errors.New("Could not get datacenters")
}

return datacenters, nil
Expand All @@ -27,7 +27,7 @@ func GetAllByUser(ctx context.Context) (*[]apicontracts.Datacenter, error) {
func GetById(ctx context.Context, datacenterId string) (*apicontracts.Datacenter, error) {
datacenter, err := datacentersRepo.GetById(ctx, datacenterId)
if err != nil {
return nil, errors.New("could not fetch datacenter by id")
return nil, errors.New("Could not get datacenter by id")
}

return datacenter, nil
Expand All @@ -36,7 +36,7 @@ func GetById(ctx context.Context, datacenterId string) (*apicontracts.Datacenter
func GetByName(ctx context.Context, datacenterName string) (*apicontracts.Datacenter, error) {
datacenter, err := datacentersRepo.FindByName(ctx, datacenterName)
if err != nil {
return nil, errors.New("could not fetch datacenter by name")
return nil, errors.New("Could not get datacenter by name")
}

return datacenter, nil
Expand All @@ -46,7 +46,7 @@ func Create(ctx context.Context, datacenterInput *apicontracts.DatacenterModel,
exists, err := datacentersRepo.FindByName(ctx, datacenterInput.Name)
if err != nil {
rlog.Error("could not create datacenter", err)
return nil, errors.New("could not fetch datacenter")
return nil, errors.New("Could not get datacenter")
}

if exists != nil {
Expand All @@ -56,7 +56,7 @@ func Create(ctx context.Context, datacenterInput *apicontracts.DatacenterModel,
datacenterResult, err := datacentersRepo.Create(ctx, datacenterInput, user)
if err != nil {
rlog.Error("could not create datacenter", err)
return nil, errors.New("could not fetch datacenters")
return nil, errors.New("Could not get datacenters")
}

_, err = auditlog.Create(ctx, "New datacenter created", models.AuditCategoryDatacenter, models.AuditActionCreate, user, datacenterResult, nil)
Expand Down
Loading

0 comments on commit 2ab9870

Please sign in to comment.