-
Notifications
You must be signed in to change notification settings - Fork 10
Expand file tree
/
Copy pathprocurement_tracker_steps.py
More file actions
603 lines (523 loc) · 28.2 KB
/
procurement_tracker_steps.py
File metadata and controls
603 lines (523 loc) · 28.2 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
"""Schemas for procurement tracker steps."""
from marshmallow import EXCLUDE, Schema, fields, post_dump, pre_dump, validate
from models.budget_line_items import BudgetLineItemStatus
from models.procurement_tracker import (
ProcurementTrackerStepStatus,
ProcurementTrackerStepType,
)
from ops_api.ops.schemas.pagination import PaginationListSchema
class NestedBudgetLineItemSchema(Schema):
"""Minimal budget line item schema for nested responses."""
id = fields.Integer(required=True)
status = fields.Enum(BudgetLineItemStatus, by_value=True, allow_none=True)
amount = fields.Float(allow_none=True)
date_needed = fields.Date(allow_none=True)
class NestedAgreementSchema(Schema):
"""Minimal agreement schema for nested responses."""
id = fields.Integer(required=True)
name = fields.String(allow_none=True)
display_name = fields.String(dump_only=True)
budget_line_items = fields.List(fields.Nested(NestedBudgetLineItemSchema), allow_none=True)
agreement_total = fields.Float(allow_none=True, dump_only=True)
class NestedProcurementTrackerSchema(Schema):
"""Minimal procurement tracker schema for nested responses."""
id = fields.Integer(required=True)
agreement_id = fields.Integer(required=True)
agreement = fields.Nested(NestedAgreementSchema, allow_none=True)
class ProcurementTrackerStepNotificationSchema(Schema):
"""Minimal step schema for notification responses.
Includes only the fields needed to display pre-award approval notifications
in the frontend without keyword matching on titles.
"""
id = fields.Integer(required=True)
step_type = fields.Enum(ProcurementTrackerStepType, required=True, by_value=False)
approval_status = fields.String(allow_none=True)
approval_requested = fields.Boolean(allow_none=True)
@pre_dump
def map_pre_award_fields(self, data, **kwargs):
"""Map pre-award prefixed fields to generic API names."""
# Handle dict inputs (from to_dict() or test fixtures)
if isinstance(data, dict):
step_type = data.get("step_type")
if step_type != ProcurementTrackerStepType.PRE_AWARD:
return data
return {
"id": data.get("id"),
"step_type": step_type,
"approval_status": data.get("pre_award_approval_status"),
"approval_requested": data.get("pre_award_approval_requested"),
}
# Handle ORM object inputs
step_type = getattr(data, "step_type", None)
if step_type != ProcurementTrackerStepType.PRE_AWARD:
return data
return {
"id": data.id,
"step_type": step_type,
"approval_status": data.pre_award_approval_status,
"approval_requested": data.pre_award_approval_requested,
}
class ProcurementTrackerStepResponseSchema(Schema):
"""Schema for procurement tracker step responses.
Note: Step-specific fields come pre-mapped from the model's to_dict() method,
which converts prefixed database column names (e.g., acquisition_planning_task_completed_by)
to generic API field names (e.g., task_completed_by) based on step_type.
"""
id = fields.Integer(required=True)
procurement_tracker_id = fields.Integer(required=True)
procurement_tracker = fields.Nested(NestedProcurementTrackerSchema, allow_none=True)
step_number = fields.Integer(required=True)
step_class = fields.String(required=True)
step_type = fields.Enum(ProcurementTrackerStepType, required=True, by_value=False)
status = fields.Enum(ProcurementTrackerStepStatus, required=True, by_value=False)
step_start_date = fields.Date(allow_none=True)
step_completed_date = fields.Date(allow_none=True)
# Step-specific fields - these come pre-mapped from model's to_dict()
# Shared by ACQUISITION_PLANNING, PRE_SOLICITATION, and SOLICITATION
task_completed_by = fields.Integer(allow_none=True)
date_completed = fields.Date(allow_none=True)
notes = fields.String(allow_none=True)
# PRE_SOLICITATION-specific
target_completion_date = fields.Date(allow_none=True)
draft_solicitation_date = fields.Date(allow_none=True)
# SOLICITATION-specific
solicitation_period_start_date = fields.Date(allow_none=True)
solicitation_period_end_date = fields.Date(allow_none=True)
# PRE_AWARD approval request fields
approval_requested = fields.Boolean(allow_none=True)
approval_requested_date = fields.Date(allow_none=True)
approval_requested_by = fields.Integer(allow_none=True)
requestor_notes = fields.String(allow_none=True)
# PRE_AWARD approval response fields
approval_status = fields.String(allow_none=True, validate=validate.OneOf(["APPROVED", "DECLINED", "PENDING"]))
approval_responded_by = fields.Integer(allow_none=True)
approval_responded_date = fields.Date(allow_none=True)
reviewer_notes = fields.String(allow_none=True)
# OPS-1639: PRE_AWARD budget team requisition fields
requisition_number = fields.String(allow_none=True)
requisition_date = fields.Date(allow_none=True)
requisition_approved_by = fields.Integer(allow_none=True)
requisition_approved_date = fields.Date(allow_none=True)
# BaseModel fields
display_name = fields.String(dump_only=True)
created_on = fields.DateTime(dump_only=True)
updated_on = fields.DateTime(dump_only=True)
@pre_dump
def map_step_specific_fields(self, obj, **_kwargs):
"""
Map step-specific prefixed fields to generic API field names.
Returns a dict with properly mapped fields while preserving enum types.
"""
# If it's already a dict (from to_dict()), return as-is
if isinstance(obj, dict):
return obj
# Import here to avoid circular imports
from models.procurement_tracker import ProcurementTrackerStepType
# Create a dict with all base fields
data = {
"id": obj.id,
"procurement_tracker_id": obj.procurement_tracker_id,
"procurement_tracker": obj.procurement_tracker if hasattr(obj, "procurement_tracker") else None,
"step_number": obj.step_number,
"step_class": obj.step_class,
"step_type": obj.step_type, # Keep as enum
"status": obj.status, # Keep as enum
"step_start_date": obj.step_start_date,
"step_completed_date": obj.step_completed_date,
"display_name": obj.display_name,
"created_on": obj.created_on,
"updated_on": obj.updated_on,
}
# Map step-specific fields based on step type
# Use getattr() with None default for backward compatibility with test data
if obj.step_type == ProcurementTrackerStepType.ACQUISITION_PLANNING:
data["task_completed_by"] = getattr(obj, "acquisition_planning_task_completed_by", None)
data["date_completed"] = getattr(obj, "acquisition_planning_date_completed", None)
data["notes"] = getattr(obj, "acquisition_planning_notes", None)
elif obj.step_type == ProcurementTrackerStepType.PRE_SOLICITATION:
data["task_completed_by"] = getattr(obj, "pre_solicitation_task_completed_by", None)
data["date_completed"] = getattr(obj, "pre_solicitation_date_completed", None)
data["notes"] = getattr(obj, "pre_solicitation_notes", None)
data["target_completion_date"] = getattr(obj, "pre_solicitation_target_completion_date", None)
data["draft_solicitation_date"] = getattr(obj, "pre_solicitation_draft_solicitation_date", None)
elif obj.step_type == ProcurementTrackerStepType.SOLICITATION:
data["task_completed_by"] = getattr(obj, "solicitation_task_completed_by", None)
data["date_completed"] = getattr(obj, "solicitation_date_completed", None)
data["notes"] = getattr(obj, "solicitation_notes", None)
data["solicitation_period_start_date"] = getattr(obj, "solicitation_period_start_date", None)
data["solicitation_period_end_date"] = getattr(obj, "solicitation_period_end_date", None)
elif obj.step_type == ProcurementTrackerStepType.EVALUATION:
data["task_completed_by"] = getattr(obj, "evaluation_task_completed_by", None)
data["date_completed"] = getattr(obj, "evaluation_date_completed", None)
data["notes"] = getattr(obj, "evaluation_notes", None)
data["target_completion_date"] = getattr(obj, "evaluation_target_completion_date", None)
elif obj.step_type == ProcurementTrackerStepType.PRE_AWARD:
data["task_completed_by"] = getattr(obj, "pre_award_task_completed_by", None)
data["date_completed"] = getattr(obj, "pre_award_date_completed", None)
data["notes"] = getattr(obj, "pre_award_notes", None)
data["target_completion_date"] = getattr(obj, "pre_award_target_completion_date", None)
data["approval_requested"] = getattr(obj, "pre_award_approval_requested", None)
data["approval_requested_date"] = getattr(obj, "pre_award_approval_requested_date", None)
data["approval_requested_by"] = getattr(obj, "pre_award_approval_requested_by", None)
data["requestor_notes"] = getattr(obj, "pre_award_requestor_notes", None)
data["approval_status"] = getattr(obj, "pre_award_approval_status", None)
data["approval_responded_by"] = getattr(obj, "pre_award_approval_responded_by", None)
data["approval_responded_date"] = getattr(obj, "pre_award_approval_responded_date", None)
data["reviewer_notes"] = getattr(obj, "pre_award_approval_reviewer_notes", None)
# OPS-1639: Budget team requisition fields
data["requisition_number"] = getattr(obj, "pre_award_requisition_number", None)
data["requisition_date"] = getattr(obj, "pre_award_requisition_date", None)
data["requisition_approved_by"] = getattr(obj, "pre_award_requisition_approved_by", None)
data["requisition_approved_date"] = getattr(obj, "pre_award_requisition_approved_date", None)
return data
@post_dump
def remove_none_values(self, data, **_kwargs):
"""Remove None values and inappropriate fields based on step_type.
For ACQUISITION_PLANNING, PRE_SOLICITATION, and SOLICITATION steps, keep step-specific keys even when None
so that clients can reliably render/edit those fields.
"""
step_type = data.get("step_type")
# Base fields that should always be present even if None
base_fields = {
"id",
"procurement_tracker_id",
"step_number",
"step_type",
"status",
"step_start_date",
"step_completed_date",
}
# Determine which fields to preserve even if None, and remove inappropriate fields
if step_type in ("ACQUISITION_PLANNING", ProcurementTrackerStepType.ACQUISITION_PLANNING):
preserve_keys = base_fields | {"task_completed_by", "date_completed", "notes"}
# Remove PRE_SOLICITATION-only fields
data.pop("target_completion_date", None)
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("PRE_SOLICITATION", ProcurementTrackerStepType.PRE_SOLICITATION):
preserve_keys = base_fields | {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
"draft_solicitation_date",
}
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("SOLICITATION", ProcurementTrackerStepType.SOLICITATION):
preserve_keys = base_fields | {
"task_completed_by",
"date_completed",
"notes",
"solicitation_period_start_date",
"solicitation_period_end_date",
}
# Remove PRE_SOLICITATION-only fields
data.pop("target_completion_date", None)
data.pop("draft_solicitation_date", None)
elif step_type in ("EVALUATION", ProcurementTrackerStepType.EVALUATION):
preserve_keys = base_fields | {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
}
# Remove PRE_SOLICITATION-only fields
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("PRE_AWARD", ProcurementTrackerStepType.PRE_AWARD):
preserve_keys = base_fields | {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
"approval_requested",
"approval_requested_date",
"approval_requested_by",
"requestor_notes",
"approval_status",
"approval_responded_by",
"approval_responded_date",
"reviewer_notes",
"requisition_number",
"requisition_date",
"requisition_approved_by",
"requisition_approved_date",
}
# Remove PRE_SOLICITATION-only fields
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
else:
preserve_keys = base_fields
# Remove all step-specific fields for other step types
for field in [
"task_completed_by",
"date_completed",
"notes",
"target_completion_date",
"draft_solicitation_date",
"solicitation_period_start_date",
"solicitation_period_end_date",
"approval_requested",
"approval_requested_date",
"approval_requested_by",
"requestor_notes",
"approval_status",
"approval_responded_by",
"approval_responded_date",
"reviewer_notes",
]:
data.pop(field, None)
return {key: value for key, value in data.items() if value is not None or key in preserve_keys}
class ProcurementTrackerStepPatchRequestSchema(Schema):
"""Schema for PATCH requests to update procurement tracker steps."""
status = fields.Enum(ProcurementTrackerStepStatus, required=True, by_value=False)
# Fields shared by Acquisition Planning, Pre-Solicitation, Solicitation, and Evaluation steps
task_completed_by = fields.Integer(required=False, allow_none=True)
date_completed = fields.Date(required=False, allow_none=True)
notes = fields.String(required=False, allow_none=True)
# Pre-solicitation specific fields
target_completion_date = fields.Date(required=False, allow_none=True)
draft_solicitation_date = fields.Date(required=False, allow_none=True)
# Solicitation specific fields
solicitation_period_start_date = fields.Date(required=False, allow_none=True)
solicitation_period_end_date = fields.Date(required=False, allow_none=True)
# Pre-Award approval request fields
approval_requested = fields.Boolean(required=False, allow_none=True)
approval_requested_date = fields.Date(required=False, allow_none=True)
# approval_requested_by is server-controlled and derived from current_user - not accepted from client
requestor_notes = fields.String(required=False, allow_none=True, validate=validate.Length(max=150))
# Pre-Award approval response fields
approval_status = fields.String(required=False, allow_none=True, validate=validate.OneOf(["APPROVED", "DECLINED"]))
# approval_responded_by and approval_responded_date are server-controlled - not accepted from client
reviewer_notes = fields.String(required=False, allow_none=True, validate=validate.Length(max=150))
# OPS-1639: Budget team requisition fields (user-provided only)
requisition_number = fields.String(required=False, allow_none=True, validate=validate.Length(max=100))
requisition_date = fields.Date(required=False, allow_none=True)
# requisition_approved_by and requisition_approved_date are SERVER-CONTROLLED - not accepted from client
class ProcurementTrackerStepSchema(Schema):
"""Schema for procurement tracker step serialization."""
class Meta:
unknown = EXCLUDE
# Base fields common to all steps
id = fields.Integer(required=True)
procurement_tracker_id = fields.Integer(required=True)
step_number = fields.Integer(required=True)
step_type = fields.Enum(ProcurementTrackerStepType, required=True)
status = fields.Enum(ProcurementTrackerStepStatus, required=True)
step_start_date = fields.Date(allow_none=True)
step_completed_date = fields.Date(allow_none=True)
# Generic field names that will be mapped from step-specific fields
task_completed_by = fields.Integer(allow_none=True)
date_completed = fields.Date(allow_none=True)
notes = fields.String(allow_none=True)
target_completion_date = fields.Date(allow_none=True)
draft_solicitation_date = fields.Date(allow_none=True)
solicitation_period_start_date = fields.Date(allow_none=True)
solicitation_period_end_date = fields.Date(allow_none=True)
# PRE_AWARD approval request fields
approval_requested = fields.Boolean(allow_none=True)
approval_requested_date = fields.Date(allow_none=True)
approval_requested_by = fields.Integer(allow_none=True)
requestor_notes = fields.String(allow_none=True)
# PRE_AWARD approval response fields
approval_status = fields.String(allow_none=True)
approval_responded_by = fields.Integer(allow_none=True)
approval_responded_date = fields.Date(allow_none=True)
reviewer_notes = fields.String(allow_none=True)
# OPS-1639: Budget team requisition fields
requisition_number = fields.String(allow_none=True)
requisition_date = fields.Date(allow_none=True)
requisition_approved_by = fields.Integer(allow_none=True)
requisition_approved_date = fields.Date(allow_none=True)
@pre_dump
def map_step_specific_fields(self, obj, **_kwargs):
"""
Map step-specific prefixed fields to generic API field names.
Returns a dict with properly mapped fields while preserving enum types.
"""
# If it's already a dict, return as-is
if isinstance(obj, dict):
return obj
# Import here to avoid circular imports
from models.procurement_tracker import ProcurementTrackerStepType
# Create a dict with all base fields
data = {
"id": obj.id,
"procurement_tracker_id": obj.procurement_tracker_id,
"step_number": obj.step_number,
"step_type": obj.step_type, # Keep as enum
"status": obj.status, # Keep as enum
"step_start_date": obj.step_start_date,
"step_completed_date": obj.step_completed_date,
}
# Map step-specific fields based on step type
# Use getattr() with None default for backward compatibility with test data
if obj.step_type == ProcurementTrackerStepType.ACQUISITION_PLANNING:
data["task_completed_by"] = getattr(obj, "acquisition_planning_task_completed_by", None)
data["date_completed"] = getattr(obj, "acquisition_planning_date_completed", None)
data["notes"] = getattr(obj, "acquisition_planning_notes", None)
elif obj.step_type == ProcurementTrackerStepType.PRE_SOLICITATION:
data["task_completed_by"] = getattr(obj, "pre_solicitation_task_completed_by", None)
data["date_completed"] = getattr(obj, "pre_solicitation_date_completed", None)
data["notes"] = getattr(obj, "pre_solicitation_notes", None)
data["target_completion_date"] = getattr(obj, "pre_solicitation_target_completion_date", None)
data["draft_solicitation_date"] = getattr(obj, "pre_solicitation_draft_solicitation_date", None)
elif obj.step_type == ProcurementTrackerStepType.SOLICITATION:
data["task_completed_by"] = getattr(obj, "solicitation_task_completed_by", None)
data["date_completed"] = getattr(obj, "solicitation_date_completed", None)
data["notes"] = getattr(obj, "solicitation_notes", None)
data["solicitation_period_start_date"] = getattr(obj, "solicitation_period_start_date", None)
data["solicitation_period_end_date"] = getattr(obj, "solicitation_period_end_date", None)
elif obj.step_type == ProcurementTrackerStepType.EVALUATION:
data["task_completed_by"] = getattr(obj, "evaluation_task_completed_by", None)
data["date_completed"] = getattr(obj, "evaluation_date_completed", None)
data["notes"] = getattr(obj, "evaluation_notes", None)
data["target_completion_date"] = getattr(obj, "evaluation_target_completion_date", None)
elif obj.step_type == ProcurementTrackerStepType.PRE_AWARD:
data["task_completed_by"] = getattr(obj, "pre_award_task_completed_by", None)
data["date_completed"] = getattr(obj, "pre_award_date_completed", None)
data["notes"] = getattr(obj, "pre_award_notes", None)
data["target_completion_date"] = getattr(obj, "pre_award_target_completion_date", None)
data["approval_requested"] = getattr(obj, "pre_award_approval_requested", None)
data["approval_requested_date"] = getattr(obj, "pre_award_approval_requested_date", None)
data["approval_requested_by"] = getattr(obj, "pre_award_approval_requested_by", None)
data["requestor_notes"] = getattr(obj, "pre_award_requestor_notes", None)
data["approval_status"] = getattr(obj, "pre_award_approval_status", None)
data["approval_responded_by"] = getattr(obj, "pre_award_approval_responded_by", None)
data["approval_responded_date"] = getattr(obj, "pre_award_approval_responded_date", None)
data["reviewer_notes"] = getattr(obj, "pre_award_approval_reviewer_notes", None)
# OPS-1639: Budget team requisition fields
data["requisition_number"] = getattr(obj, "pre_award_requisition_number", None)
data["requisition_date"] = getattr(obj, "pre_award_requisition_date", None)
data["requisition_approved_by"] = getattr(obj, "pre_award_requisition_approved_by", None)
data["requisition_approved_date"] = getattr(obj, "pre_award_requisition_approved_date", None)
return data
@post_dump
def remove_none_step_specific_fields(self, data, **_kwargs):
"""
Remove step-specific fields for steps that don't use them.
For ACQUISITION_PLANNING steps, keep acquisition planning fields even if None.
For PRE_SOLICITATION steps, keep pre-solicitation fields even if None.
For SOLICITATION steps, keep solicitation fields even if None.
For other step types, remove all step-specific fields entirely.
"""
step_type = data.get("step_type")
acquisition_fields = {"task_completed_by", "date_completed", "notes"}
pre_solicitation_fields = {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
"draft_solicitation_date",
}
solicitation_fields = {
"task_completed_by",
"date_completed",
"notes",
"solicitation_period_start_date",
"solicitation_period_end_date",
}
# Base fields that should always be present even if None
base_fields = {
"id",
"procurement_tracker_id",
"step_number",
"step_type",
"status",
"step_start_date",
"step_completed_date",
}
# Determine which fields to preserve even if None, and remove inappropriate fields
if step_type in ("ACQUISITION_PLANNING", ProcurementTrackerStepType.ACQUISITION_PLANNING):
preserve_keys = base_fields | acquisition_fields
# Remove PRE_SOLICITATION-only fields
data.pop("target_completion_date", None)
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("PRE_SOLICITATION", ProcurementTrackerStepType.PRE_SOLICITATION):
preserve_keys = base_fields | pre_solicitation_fields
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("SOLICITATION", ProcurementTrackerStepType.SOLICITATION):
preserve_keys = base_fields | solicitation_fields
# Remove PRE_SOLICITATION-only fields
data.pop("target_completion_date", None)
data.pop("draft_solicitation_date", None)
elif step_type in ("EVALUATION", ProcurementTrackerStepType.EVALUATION):
evaluation_fields = {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
}
preserve_keys = base_fields | evaluation_fields
# Remove PRE_SOLICITATION-only fields
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
elif step_type in ("PRE_AWARD", ProcurementTrackerStepType.PRE_AWARD):
pre_award_fields = {
"target_completion_date",
"task_completed_by",
"date_completed",
"notes",
"approval_requested",
"approval_requested_date",
"approval_requested_by",
"requestor_notes",
"approval_status",
"approval_responded_by",
"approval_responded_date",
"reviewer_notes",
"requisition_number",
"requisition_date",
"requisition_approved_by",
"requisition_approved_date",
}
preserve_keys = base_fields | pre_award_fields
# Remove PRE_SOLICITATION-only fields
data.pop("draft_solicitation_date", None)
# Remove SOLICITATION-only fields
data.pop("solicitation_period_start_date", None)
data.pop("solicitation_period_end_date", None)
else:
preserve_keys = base_fields
# Remove all step-specific fields for other step types
for field in [
"task_completed_by",
"date_completed",
"notes",
"target_completion_date",
"draft_solicitation_date",
"solicitation_period_start_date",
"solicitation_period_end_date",
"approval_requested",
"approval_requested_date",
"approval_requested_by",
"requestor_notes",
"approval_status",
"approval_responded_by",
"approval_responded_date",
"reviewer_notes",
]:
data.pop(field, None)
# Remove None values except for preserved fields
return {key: value for key, value in data.items() if value is not None or key in preserve_keys}
class ProcurementTrackerStepsQueryParametersSchema(PaginationListSchema):
"""Schema for GET /procurement-tracker-steps endpoint query parameters."""
class Meta:
unknown = EXCLUDE
# Filtering parameters (all are lists since HTTP allows multiple values)
agreement_id = fields.List(fields.Integer(), required=False)