rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove people service and coredata

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-02-06 20:03:47 +04:00
parent 3a459f1992
commit 5fb389e8bc
8 changed files with 76 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/probo/document_service.go
View File

@@ -604,10 +604,10 @@ func (s *DocumentService) SignDocumentVersion(
return nil
}
func (s *DocumentService) SignDocumentVersionByEmail(
func (s *DocumentService) SignDocumentVersionByIdentity(
ctx context.Context,
documentVersionID gid.GID,
userEmail mail.Addr,
identityID gid.GID,
) (*coredata.DocumentVersionSignature, error) {
var documentVersionSignature *coredata.DocumentVersionSignature
@@ -619,14 +619,14 @@ func (s *DocumentService) SignDocumentVersionByEmail(
return fmt.Errorf("cannot get document version: %w", err)
}
people := &coredata.People{}
profile := &coredata.MembershipProfile{}
// FIXME: will be done differently
if err := people.LoadByEmailAndOrganizationID(ctx, conn, s.svc.scope, userEmail, documentVersion.OrganizationID); err != nil {
return fmt.Errorf("cannot find people record for user email in organization %q: %w", documentVersion.OrganizationID, err)
if err := profile.LoadByIdentityIDAndOrganizationID(ctx, conn, s.svc.scope, identityID, documentVersion.OrganizationID); err != nil {
return fmt.Errorf("cannot find profile record for user email in organization %q: %w", documentVersion.OrganizationID, err)
}
var signErr error
documentVersionSignature, signErr = s.signDocumentVersionInTx(ctx, conn, documentVersionID, people.ID)
documentVersionSignature, signErr = s.signDocumentVersionInTx(ctx, conn, documentVersionID, profile.ID)
return signErr
},
)

315
pkg/probo/people_service.go
View File

@@ -1,315 +0,0 @@
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package probo
import (
"context"
"fmt"
"time"
"go.gearno.de/kit/pg"
"go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/mail"
"go.probo.inc/probo/pkg/page"
"go.probo.inc/probo/pkg/validator"
)
type (
PeopleService struct {
svc *TenantService
}
CreatePeopleRequest struct {
OrganizationID gid.GID
FullName string
PrimaryEmailAddress mail.Addr
AdditionalEmailAddresses []mail.Addr
Kind coredata.PeopleKind
Position *string
ContractStartDate *time.Time
ContractEndDate *time.Time
}
UpdatePeopleRequest struct {
ID gid.GID
Kind *coredata.PeopleKind
FullName *string
PrimaryEmailAddress *mail.Addr
AdditionalEmailAddresses *[]mail.Addr
Position **string
ContractStartDate **time.Time
ContractEndDate **time.Time
}
)
func (cpr *CreatePeopleRequest) Validate() error {
v := validator.New()
v.Check(cpr.OrganizationID, "organization_id", validator.Required(), validator.GID(coredata.OrganizationEntityType))
v.Check(cpr.FullName, "full_name", validator.SafeTextNoNewLine(NameMaxLength))
v.Check(cpr.PrimaryEmailAddress, "primary_email_address", validator.Required(), validator.NotEmpty())
v.CheckEach(cpr.AdditionalEmailAddresses, "additional_email_addresses", func(index int, item any) {
v.Check(item, fmt.Sprintf("additional_email_addresses[%d]", index), validator.Required(), validator.NotEmpty())
})
v.Check(cpr.Kind, "kind", validator.Required(), validator.OneOfSlice(coredata.PeopleKinds()))
v.Check(cpr.Position, "position", validator.SafeText(TitleMaxLength))
v.Check(cpr.ContractStartDate, "contract_start_date", validator.Before(cpr.ContractEndDate))
v.Check(cpr.ContractEndDate, "contract_end_date", validator.After(cpr.ContractStartDate))
return v.Error()
}
func (upr *UpdatePeopleRequest) Validate() error {
v := validator.New()
// v.Check(upr.ID, "id", validator.Required(), validator.GID(coredata.PeopleEntityType))
v.Check(upr.Kind, "kind", validator.OneOfSlice(coredata.PeopleKinds()))
v.Check(upr.FullName, "full_name", validator.SafeTextNoNewLine(NameMaxLength))
v.Check(upr.PrimaryEmailAddress, "primary_email_address", validator.NotEmpty())
v.CheckEach(upr.AdditionalEmailAddresses, "additional_email_addresses", func(index int, item any) {
v.Check(item, fmt.Sprintf("additional_email_addresses[%d]", index), validator.Required(), validator.NotEmpty())
})
v.Check(upr.Position, "position", validator.SafeText(TitleMaxLength))
v.Check(upr.ContractStartDate, "contract_start_date", validator.Before(upr.ContractEndDate))
v.Check(upr.ContractEndDate, "contract_end_date", validator.After(upr.ContractStartDate))
return v.Error()
}
func (s PeopleService) Get(
ctx context.Context,
peopleID gid.GID,
) (*coredata.People, error) {
people := &coredata.People{}
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return people.LoadByID(ctx, conn, s.svc.scope, peopleID)
},
)
if err != nil {
return nil, err
}
return people, nil
}
func (s PeopleService) GetByEmailAndOrganizationID(
ctx context.Context,
primaryEmailAddress mail.Addr,
organizationID gid.GID,
) (*coredata.People, error) {
people := &coredata.People{}
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
err := people.LoadByEmailAndOrganizationID(ctx, conn, s.svc.scope, primaryEmailAddress, organizationID)
if err != nil {
return fmt.Errorf("cannot load people by email and organization ID: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return people, nil
}
func (s PeopleService) CountForOrganizationID(
ctx context.Context,
organizationID gid.GID,
filter *coredata.PeopleFilter,
) (int, error) {
var count int
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) (err error) {
peoples := coredata.Peoples{}
count, err = peoples.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter)
if err != nil {
return fmt.Errorf("cannot count peoples: %w", err)
}
return nil
},
)
if err != nil {
return 0, err
}
return count, nil
}
func (s PeopleService) ListForOrganizationID(
ctx context.Context,
organizationID gid.GID,
cursor *page.Cursor[coredata.PeopleOrderField],
filter *coredata.PeopleFilter,
) (*page.Page[*coredata.People, coredata.PeopleOrderField], error) {
var peoples coredata.Peoples
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return peoples.LoadByOrganizationID(
ctx,
conn,
s.svc.scope,
organizationID,
cursor,
filter,
)
},
)
if err != nil {
return nil, err
}
return page.NewPage(peoples, cursor), nil
}
func (s PeopleService) Update(
ctx context.Context,
req UpdatePeopleRequest,
) (*coredata.People, error) {
if err := req.Validate(); err != nil {
return nil, fmt.Errorf("invalid request: %w", err)
}
people := &coredata.People{}
err := s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := people.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil {
return fmt.Errorf("cannot load people: %w", err)
}
if req.Kind != nil {
people.Kind = *req.Kind
}
if req.FullName != nil {
people.FullName = *req.FullName
}
if req.PrimaryEmailAddress != nil {
people.PrimaryEmailAddress = *req.PrimaryEmailAddress
}
if req.AdditionalEmailAddresses != nil {
people.AdditionalEmailAddresses = *req.AdditionalEmailAddresses
}
if req.Position != nil {
people.Position = *req.Position
}
if req.ContractStartDate != nil {
people.ContractStartDate = *req.ContractStartDate
}
if req.ContractEndDate != nil {
people.ContractEndDate = *req.ContractEndDate
}
if people.ContractStartDate != nil && people.ContractEndDate != nil {
if people.ContractEndDate.Before(*people.ContractStartDate) {
return fmt.Errorf("contract end date must be after or equal to start date")
}
}
people.UpdatedAt = time.Now()
return people.Update(ctx, conn, s.svc.scope)
})
if err != nil {
return nil, err
}
return people, nil
}
func (s PeopleService) Create(
ctx context.Context,
req CreatePeopleRequest,
) (*coredata.People, error) {
if err := req.Validate(); err != nil {
return nil, fmt.Errorf("invalid request: %w", err)
}
now := time.Now()
peopleID := gid.New(s.svc.scope.GetTenantID(), 8)
organization := &coredata.Organization{}
people := &coredata.People{
ID: peopleID,
OrganizationID: req.OrganizationID,
Kind: req.Kind,
FullName: req.FullName,
PrimaryEmailAddress: req.PrimaryEmailAddress,
AdditionalEmailAddresses: req.AdditionalEmailAddresses,
Position: req.Position,
ContractStartDate: req.ContractStartDate,
ContractEndDate: req.ContractEndDate,
CreatedAt: now,
UpdatedAt: now,
}
err := s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil {
return fmt.Errorf("cannot load organization %q: %w", req.OrganizationID, err)
}
if err := people.Insert(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert people: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return people, nil
}
func (s PeopleService) Delete(
ctx context.Context,
peopleID gid.GID,
) error {
people := coredata.People{ID: peopleID}
return s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return people.Delete(ctx, conn, s.svc.scope)
},
)
}

2
pkg/probo/service.go
View File

@@ -79,7 +79,6 @@ type (
Evidences *EvidenceService
Organizations *OrganizationService
Vendors *VendorService
Peoples *PeopleService
Documents *DocumentService
Controls *ControlService
Risks *RiskService
@@ -186,7 +185,6 @@ func (s *Service) WithTenant(tenantID gid.TenantID) *TenantService {
),
),
}
tenantService.Peoples = &PeopleService{svc: tenantService}
tenantService.Vendors = &VendorService{svc: tenantService}
tenantService.Documents = &DocumentService{
svc: tenantService,