Enhance people

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>

pkg/coredata/people.go

@@ -300,6 +300,7 @@ func (p *Peoples) CountByOrganizationID(
 	conn pg.Conn,
 	scope Scoper,
 	organizationID gid.GID,
+	filter *PeopleFilter,
 ) (int, error) {
 	q := `
 SELECT
@@ -309,12 +310,14 @@ FROM
 WHERE
     %s
     AND organization_id = @organization_id
+    AND %s
 `
 
-	q = fmt.Sprintf(q, scope.SQLFragment())
+	q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment())
 
 	args := pgx.StrictNamedArgs{"organization_id": organizationID}
 	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, filter.SQLArguments())
 
 	row := conn.QueryRow(ctx, q, args)
 
@@ -333,6 +336,7 @@ func (p *Peoples) LoadByOrganizationID(
 	scope Scoper,
 	organizationID gid.GID,
 	cursor *page.Cursor[PeopleOrderField],
+	filter *PeopleFilter,
 ) error {
 	q := `
 SELECT
@@ -354,13 +358,15 @@ WHERE
     %s
     AND organization_id = @organization_id
     AND %s
+    AND %s
 `
 
-	q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
+	q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment(), cursor.SQLFragment())
 
 	args := pgx.StrictNamedArgs{"organization_id": organizationID}
 	maps.Copy(args, cursor.SQLArguments())
 	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, filter.SQLArguments())
 
 	rows, err := conn.Query(ctx, q, args)
 	if err != nil {

pkg/coredata/people_filter.go

@@ -0,0 +1,53 @@
+// 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 coredata
+
+import (
+	"time"
+
+	"github.com/jackc/pgx/v5"
+)
+
+type (
+	PeopleFilter struct {
+		excludeContractEnded *bool
+		currentDate          time.Time
+	}
+)
+
+func NewPeopleFilter(excludeContractEnded *bool) *PeopleFilter {
+	return &PeopleFilter{
+		excludeContractEnded: excludeContractEnded,
+		currentDate:          time.Now(),
+	}
+}
+
+func (f *PeopleFilter) SQLArguments() pgx.StrictNamedArgs {
+	return pgx.StrictNamedArgs{
+		"exclude_contract_ended": f.excludeContractEnded,
+		"current_date":           f.currentDate,
+	}
+}
+
+func (f *PeopleFilter) SQLFragment() string {
+	return `
+(
+	CASE
+		WHEN @exclude_contract_ended::boolean IS NOT NULL AND @exclude_contract_ended::boolean = true THEN
+			(contract_end_date IS NULL OR contract_end_date >= @current_date::date)
+		ELSE TRUE
+	END
+)`
+}