fx build fix

api/server/internal/server/organizationimp/crud.go

@@ -0,0 +1,71 @@
+package organizationimp
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"github.com/tech/sendico/pkg/api/http/response"
+	"github.com/tech/sendico/pkg/merrors"
+	"github.com/tech/sendico/pkg/model"
+	"github.com/tech/sendico/pkg/mutil/mzap"
+	"github.com/tech/sendico/server/interface/api/sresponse"
+	mutil "github.com/tech/sendico/server/internal/mutil/param"
+	"go.uber.org/zap"
+)
+
+func (a *OrganizationAPI) list(r *http.Request, account *model.Account, accessToken *sresponse.TokenData) http.HandlerFunc {
+	orgs, err := a.db.List(r.Context(), *account.GetID(), nil)
+	if errors.Is(err, merrors.ErrNoData) || (len(orgs) == 0) {
+		a.logger.Debug("Organizations not found", zap.Error(err), mzap.StorableRef(account))
+		return response.NotFound(a.logger, a.Name(), "orgnizations not found")
+	}
+	if err != nil {
+		a.logger.Warn("Failed to fetch organizations", zap.Error(err))
+		return response.Internal(a.logger, a.Name(), err)
+	}
+	return sresponse.Organizations(a.logger, orgs, accessToken)
+}
+
+func (a *OrganizationAPI) get(r *http.Request, account *model.Account, accessToken *sresponse.TokenData) http.HandlerFunc {
+	orgRef, err := mutil.GetOrganizationRef(r)
+	if err != nil {
+		a.logger.Warn("Failed to parse organization id", zap.Error(err), zap.String("organization_ref", mutil.GetOrganizationID(r)))
+		return response.BadReference(a.logger, a.Name(), mutil.OrganizationRefName(), mutil.GetOrganizationID(r), err)
+	}
+
+	var org model.Organization
+	if err := a.db.Get(r.Context(), *account.GetID(), orgRef, &org); err != nil {
+		if errors.Is(err, merrors.ErrNoData) {
+			a.logger.Debug("Organization not found", mzap.ObjRef("organization_ref", orgRef), zap.Error(err))
+			return response.NotFound(a.logger, a.Name(), "organization with given id not found")
+		}
+		a.logger.Error("Error fetching organization", mzap.ObjRef("organization_ref", orgRef), zap.Error(err))
+		return response.Internal(a.logger, a.Name(), err)
+	}
+
+	return sresponse.Organization(a.logger, &org, accessToken)
+}
+
+func (a *OrganizationAPI) update(r *http.Request, acccount *model.Account, accessToken *sresponse.TokenData) http.HandlerFunc {
+	var org model.OrganizationBase
+	if err := json.NewDecoder(r.Body).Decode(&org); err != nil {
+		a.logger.Warn("Failed to decode organization when updating settings", zap.Error(err))
+		return response.BadPayload(a.logger, a.Name(), err)
+	}
+
+	ctx := r.Context()
+	var orgStored model.Organization
+	if err := a.db.Get(ctx, *acccount.GetID(), *org.GetID(), &orgStored); err != nil {
+		a.logger.Warn("Failed to fetch organization for update", zap.Error(err), mzap.StorableRef(&org), mzap.StorableRef(acccount))
+		return response.Auto(a.logger, a.Name(), err)
+	}
+
+	orgStored.OrganizationBase = org
+	if err := a.db.Update(r.Context(), *acccount.GetID(), &orgStored); err != nil {
+		a.logger.Warn("Error fetching organization", mzap.StorableRef(&org), zap.Error(err))
+		return response.Internal(a.logger, a.Name(), err)
+	}
+
+	return sresponse.Organization(a.logger, &orgStored, accessToken)
+}

api/server/internal/server/organizationimp/invitation.go

@@ -0,0 +1,37 @@
+package organizationimp
+
+import (
+	"net/http"
+
+	"github.com/tech/sendico/pkg/api/http/response"
+	"github.com/tech/sendico/pkg/merrors"
+	"github.com/tech/sendico/pkg/model"
+	"github.com/tech/sendico/pkg/mutil/mzap"
+	"github.com/tech/sendico/server/interface/api/sresponse"
+	mutil "github.com/tech/sendico/server/internal/mutil/param"
+	"go.uber.org/zap"
+)
+
+func (a *OrganizationAPI) invitation(r *http.Request, account *model.Account, accessToken *sresponse.TokenData) http.HandlerFunc {
+	invitationRef, err := mutil.GetInvitationRef(r)
+	if err != nil {
+		a.logger.Warn("Failed to parse organization id", zap.Error(err), zap.String("invitation_ref", mutil.GetOrganizationID(r)))
+		return response.Auto(a.logger, a.Name(), merrors.InvalidArgument("bad invitation reference"))
+	}
+	ctx := r.Context()
+
+	var invitation model.Invitation
+	if err := a.idb.Get(ctx, *account.GetID(), invitationRef, &invitation); err != nil {
+		a.logger.Warn("Failed to fetch invitation", zap.Error(err), mzap.ObjRef("invitation_ref", invitationRef))
+		return response.Auto(a.logger, a.Name(), err)
+	}
+
+	var org model.Organization
+	if err := a.db.Get(ctx, *account.GetID(), invitation.OrganizationRef, &org); err != nil {
+		a.logger.Error("Error fetching organization", zap.Error(err),
+			mzap.StorableRef(&invitation), mzap.ObjRef("organization_ref", invitation.OrganizationRef))
+		return response.Auto(a.logger, a.Name(), err)
+	}
+
+	return sresponse.OrganizationPublic(a.logger, &org.OrganizationBase)
+}

api/server/internal/server/organizationimp/service.go

@@ -0,0 +1,59 @@
+package organizationimp
+
+import (
+	"context"
+
+	api "github.com/tech/sendico/pkg/api/http"
+	"github.com/tech/sendico/pkg/auth"
+	"github.com/tech/sendico/pkg/db/invitation"
+	"github.com/tech/sendico/pkg/db/organization"
+	"github.com/tech/sendico/pkg/mlogger"
+	"github.com/tech/sendico/pkg/mservice"
+	eapi "github.com/tech/sendico/server/interface/api"
+	"github.com/tech/sendico/server/interface/services/fileservice"
+	mutil "github.com/tech/sendico/server/internal/mutil/param"
+	"go.uber.org/zap"
+)
+
+type OrganizationAPI struct {
+	logger   mlogger.Logger
+	db       organization.DB
+	idb      invitation.DB
+	images   mservice.MicroService
+	enforcer auth.Enforcer
+}
+
+func (a *OrganizationAPI) Name() mservice.Type {
+	return mservice.Organizations
+}
+
+func (a *OrganizationAPI) Finish(ctx context.Context) error {
+	return a.images.Finish(ctx)
+}
+
+func CreateAPI(a eapi.API) (*OrganizationAPI, error) {
+	p := new(OrganizationAPI)
+	p.logger = a.Logger().Named(p.Name())
+	p.enforcer = a.Permissions().Enforcer()
+	var err error
+	if p.db, err = a.DBFactory().NewOrganizationDB(); err != nil {
+		p.logger.Error("Failed to create organizations database", zap.Error(err))
+		return nil, err
+	}
+	if p.idb, err = a.DBFactory().NewInvitationsDB(); err != nil {
+		p.logger.Error("Failed to create invitations database", zap.Error(err))
+		return nil, err
+	}
+
+	a.Register().AccountHandler(mservice.Organizations, "", api.Get, p.list)
+	a.Register().AccountHandler(mservice.Organizations, mutil.AddOrganizaztionRef("/"), api.Get, p.get)
+	a.Register().AccountHandler(mservice.Organizations, "", api.Put, p.update)
+	a.Register().AccountHandler(mservice.Organizations, mutil.AddInvitationRef("/invitation"), api.Get, p.invitation)
+
+	if p.images, err = fileservice.CreateAPI(a, p.Name()); err != nil {
+		p.logger.Error("Failed to create image server", zap.Error(err))
+		return nil, err
+	}
+
+	return p, nil
+}