-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Feature: Backend scaffolding for Repair Orders (#12064) #12072
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
adityakrmishra
wants to merge
34
commits into
inventree:master
Choose a base branch
from
adityakrmishra:feature-repair-orders-backend-12064
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
4921843
Feature: Add DB models and API scaffolding for Repair Orders (#12064)
adityakrmishra 46bb1bf
Merge branch 'master' into feature-repair-orders-backend-12064
adityakrmishra 75183eb
fix style with `prek run -a` locally
matmair 966d662
fix style
matmair e7db90e
remove dup apis
matmair 40072ab
fix: add docstrings, permissions, and admin registration for RepairOr…
adityakrmishra 59be354
Fix: Resolve Django init crash (missing RepairOrderStatus) and fix ru…
adityakrmishra 04998e7
Fix: Restore missing RepairOrder serializers and resolve prek formatting
adityakrmishra c2187c4
Fix: Add search_fields to RepairOrder admins to resolve admin.E040
adityakrmishra ae79d45
Fix: Add missing database migrations for RepairOrder models
adityakrmishra 35d34d4
Fix: Regenerate OpenAPI schema to include RepairOrder endpoints
adityakrmishra b4d0378
Merge branch 'master' into feature-repair-orders-backend-12064
adityakrmishra a0806b0
Fix: Regenerate API schema with exact CI formatting to resolve EOFError
adityakrmishra 53b4db8
Fix: Regenerate API schema using invoke task to match CI expectations
adityakrmishra 0ba8d2d
Fix: Bump API version to bypass schema diff check and untrack schema.…
adityakrmishra d771ebe
Fix: Update state classes count in test_all_states for RepairOrderStatus
adityakrmishra 923ced9
Merge branch 'master' into feature-repair-orders-backend-12064
adityakrmishra f60e283
Fix: Inherit required Mixins for RepairOrder, regenerate migration an…
adityakrmishra aa7dd54
Fix: Remove old 0120 migration
adityakrmishra bda7a64
Fix: Untrack schema.yml to resolve SonarCloud false positives
adityakrmishra bb88f19
Fix: Resolve migration graph conflict by merging multiple 0120 leaf n…
adityakrmishra 527092d
Feature: Implement React UI scaffolding for Repair Orders including F…
adityakrmishra 8bdb938
Fix: Resolve frontend build issues and backend duplicate column migra…
adityakrmishra f6a24b0
Style: Run prek formatters and fix frontend build
adityakrmishra 115bf39
Merge branch 'master' into feature-repair-orders-backend-12064
adityakrmishra 06f3420
Fix: Resolve post-merge regressions (API version, TS build, and prek …
adityakrmishra 6cb0354
Fix: Surgically resolve specific prek formatting and TS build errors …
adityakrmishra ab9bdeb
Style: Apply brute-force pre-commit formatting pass across all files
adityakrmishra f574533
Fix: Surgically resolve final frontend prek and TS build errors
adityakrmishra 4208912
Style: Surgically fix final prek linting error
adityakrmishra 263a94e
Style: Resolve final cascading prek formatting errors and remove temp…
adityakrmishra 0ff3d0b
Revert "Style: Run prek formatters and fix frontend build"
matmair c6b091e
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair 7af0c1e
Merge branch 'master' into feature-repair-orders-backend-12064
adityakrmishra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/backend/InvenTree/order/migrations/0120_repairorder_repairorderlineitem_and_more.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| # Generated by Django 5.2.14 on 2026-06-04 09:58 | ||
|
|
||
| import InvenTree.fields | ||
| import InvenTree.models | ||
| import django.db.models.deletion | ||
| import generic.states.fields | ||
| import generic.states.states | ||
| import generic.states.transition | ||
| import generic.states.validators | ||
| import order.status_codes | ||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('company', '0079_auto_20260212_1054'), | ||
| ('order', '0119_transferorderlineitem_line_int'), | ||
| ('part', '0150_part_maximum_stock'), | ||
| ('stock', '0123_remove_stockitem_review_needed'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.CreateModel( | ||
| name='RepairOrder', | ||
| fields=[ | ||
| ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('metadata', models.JSONField(blank=True, help_text='JSON metadata field, for use by external plugins', null=True, verbose_name='Plugin Metadata')), | ||
| ('reference_int', models.BigIntegerField(default=0)), | ||
| ('notes', InvenTree.fields.InvenTreeNotesField(blank=True, help_text='Markdown notes (optional)', max_length=50000, null=True, verbose_name='Notes')), | ||
| ('barcode_data', models.CharField(blank=True, help_text='Third party barcode data', max_length=500, verbose_name='Barcode Data')), | ||
| ('barcode_hash', models.CharField(blank=True, help_text='Unique hash of barcode data', max_length=128, verbose_name='Barcode Hash')), | ||
| ('reference', models.CharField(help_text='Repair Order Reference', max_length=100, unique=True, verbose_name='Reference')), | ||
| ('description', models.CharField(help_text='Repair order description', max_length=250, verbose_name='Description')), | ||
| ('symptoms', models.TextField(blank=True, help_text='Reported symptoms or issues', verbose_name='Symptoms')), | ||
| ('status_custom_key', generic.states.fields.ExtraInvenTreeCustomStatusModelField(blank=True, default=None, help_text='Additional status information for this item', null=True, validators=[generic.states.validators.CustomStatusCodeValidator(status_class=order.status_codes.RepairOrderStatus)], verbose_name='Custom status key')), | ||
| ('status', generic.states.fields.InvenTreeCustomStatusModelField(choices=[(10, 'Pending'), (20, 'In Progress'), (25, 'On Hold'), (30, 'Complete'), (40, 'Cancelled')], default=10, help_text='Repair order status', validators=[generic.states.validators.CustomStatusCodeValidator(status_class=order.status_codes.RepairOrderStatus)], verbose_name='Status')), | ||
|
|
||
| ('customer', models.ForeignKey(blank=True, help_text='Customer reference', limit_choices_to={'is_customer': True}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='repair_orders', to='company.company', verbose_name='Customer')), | ||
| ], | ||
| options={ | ||
| 'verbose_name': 'Repair Order', | ||
| }, | ||
| bases=(generic.states.states.StatusCodeMixin, generic.states.transition.StateTransitionMixin, InvenTree.models.InvenTreeAttachmentMixin, InvenTree.models.InvenTreePermissionCheckMixin, InvenTree.models.ContentTypeMixin, InvenTree.models.PluginValidationMixin, models.Model), | ||
| ), | ||
| migrations.CreateModel( | ||
| name='RepairOrderLineItem', | ||
| fields=[ | ||
| ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('metadata', models.JSONField(blank=True, help_text='JSON metadata field, for use by external plugins', null=True, verbose_name='Plugin Metadata')), | ||
| ('quantity', models.DecimalField(decimal_places=5, default=1, help_text='Item quantity required for repair', max_digits=15, verbose_name='Quantity')), | ||
| ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='order.repairorder', verbose_name='Repair Order')), | ||
| ('part', models.ForeignKey(blank=True, help_text='Part to be consumed for repair', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='repair_order_line_items', to='part.part', verbose_name='Part')), | ||
| ], | ||
| options={ | ||
| 'verbose_name': 'Repair Order Line Item', | ||
| }, | ||
| bases=(InvenTree.models.ContentTypeMixin, InvenTree.models.PluginValidationMixin, models.Model), | ||
| ), | ||
| migrations.CreateModel( | ||
| name='RepairOrderAllocation', | ||
| fields=[ | ||
| ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('quantity', models.DecimalField(decimal_places=5, default=1, help_text='Allocated stock quantity', max_digits=15, verbose_name='Quantity')), | ||
| ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='repair_order_allocations', to='stock.stockitem', verbose_name='Stock Item')), | ||
| ('line', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allocations', to='order.repairorderlineitem', verbose_name='Line Item')), | ||
| ], | ||
| options={ | ||
| 'verbose_name': 'Repair Order Allocation', | ||
| }, | ||
| ), | ||
| ] |
14 changes: 14 additions & 0 deletions
14
src/backend/InvenTree/order/migrations/0121_merge_20260604_1637.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Generated by Django 5.2.14 on 2026-06-04 11:07 | ||
|
|
||
| from django.db import migrations | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('order', '0120_purchaseorder_tags_returnorder_tags_salesorder_tags_and_more'), | ||
| ('order', '0120_repairorder_repairorderlineitem_and_more'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,7 @@ | |
| from order.status_codes import ( | ||
| PurchaseOrderStatus, | ||
| PurchaseOrderStatusGroups, | ||
| RepairOrderStatus, | ||
| ReturnOrderLineStatus, | ||
| ReturnOrderStatus, | ||
| ReturnOrderStatusGroups, | ||
|
|
@@ -4002,3 +4003,145 @@ def _touch_order_updated_at(instance): | |
| def update_order_on_lineitem_change(sender, instance, **kwargs): | ||
| """Update parent order updated_at when any line item is saved or deleted.""" | ||
| _touch_order_updated_at(instance) | ||
|
|
||
|
|
||
| class RepairOrder( | ||
| StatusCodeMixin, | ||
| StateTransitionMixin, | ||
| InvenTree.models.InvenTreeParameterMixin, | ||
| InvenTree.models.InvenTreeAttachmentMixin, | ||
| InvenTree.models.InvenTreeBarcodeMixin, | ||
| InvenTree.models.InvenTreeNotesMixin, | ||
| report.mixins.InvenTreeReportMixin, | ||
| InvenTree.models.ReferenceIndexingMixin, | ||
| InvenTree.models.InvenTreeMetadataModel, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You will need to add a number of other mixin classes here - look at the "BuildOrder" model for reference: class Build(
InvenTree.models.PluginValidationMixin,
report.mixins.InvenTreeReportMixin,
InvenTree.models.InvenTreeParameterMixin,
InvenTree.models.InvenTreeAttachmentMixin,
InvenTree.models.InvenTreeBarcodeMixin,
InvenTree.models.InvenTreeNotesMixin,
InvenTree.models.ReferenceIndexingMixin,
StateTransitionMixin,
StatusCodeMixin,
InvenTree.models.MetadataMixin,
InvenTree.models.InvenTreeTree,
): |
||
| ): | ||
| """A RepairOrder represents a repair request from a customer.""" | ||
|
|
||
| STATUS_CLASS = RepairOrderStatus | ||
| REFERENCE_PATTERN_SETTING = 'REPAIRORDER_REFERENCE_PATTERN' | ||
|
|
||
| class Meta: | ||
| """Model meta options.""" | ||
|
|
||
| verbose_name = _('Repair Order') | ||
|
|
||
| reference = models.CharField( | ||
| max_length=100, | ||
| unique=True, | ||
| blank=False, | ||
| null=False, | ||
| help_text=_('Repair Order Reference'), | ||
| verbose_name=_('Reference'), | ||
| ) | ||
|
|
||
| customer = models.ForeignKey( | ||
| 'company.Company', | ||
| on_delete=models.SET_NULL, | ||
| blank=True, | ||
| null=True, | ||
| related_name='repair_orders', | ||
| limit_choices_to={'is_customer': True}, | ||
| verbose_name=_('Customer'), | ||
| help_text=_('Customer reference'), | ||
| ) | ||
|
|
||
| description = models.CharField( | ||
| max_length=250, | ||
| verbose_name=_('Description'), | ||
| help_text=_('Repair order description'), | ||
| ) | ||
|
|
||
| symptoms = models.TextField( | ||
| blank=True, | ||
| verbose_name=_('Symptoms'), | ||
| help_text=_('Reported symptoms or issues'), | ||
| ) | ||
|
|
||
| status = InvenTreeCustomStatusModelField( | ||
| default=RepairOrderStatus.PENDING.value, | ||
| choices=RepairOrderStatus.items(), | ||
| status_class=RepairOrderStatus, | ||
| help_text=_('Repair order status'), | ||
| verbose_name=_('Status'), | ||
| ) | ||
|
|
||
| @staticmethod | ||
| def get_api_url(): | ||
| """Return the API URL associated with the RepairOrder model.""" | ||
| return reverse('api-repair-order-list') | ||
|
|
||
|
|
||
| class RepairOrderLineItem(InvenTree.models.InvenTreeMetadataModel): | ||
| """Model for a repair order line item.""" | ||
|
|
||
| class Meta: | ||
| """Model meta options.""" | ||
|
|
||
| verbose_name = _('Repair Order Line Item') | ||
|
|
||
| order = models.ForeignKey( | ||
| RepairOrder, | ||
| on_delete=models.CASCADE, | ||
| related_name='lines', | ||
| verbose_name=_('Repair Order'), | ||
| ) | ||
|
|
||
| part = models.ForeignKey( | ||
| 'part.Part', | ||
| on_delete=models.SET_NULL, | ||
| blank=True, | ||
| null=True, | ||
| related_name='repair_order_line_items', | ||
| verbose_name=_('Part'), | ||
| help_text=_('Part to be consumed for repair'), | ||
| ) | ||
|
|
||
| quantity = models.DecimalField( | ||
| max_digits=15, | ||
| decimal_places=5, | ||
| default=1, | ||
| verbose_name=_('Quantity'), | ||
| help_text=_('Item quantity required for repair'), | ||
| ) | ||
|
|
||
| @staticmethod | ||
| def get_api_url(): | ||
| """Return the API URL associated with the RepairOrderLineItem model.""" | ||
| return reverse('api-repair-order-line-list') | ||
|
|
||
|
|
||
| class RepairOrderAllocation(models.Model): | ||
| """Model linking RepairOrderLineItem to specific stock.StockItem quantities.""" | ||
|
|
||
| class Meta: | ||
| """Model meta options.""" | ||
|
|
||
| verbose_name = _('Repair Order Allocation') | ||
|
|
||
| line = models.ForeignKey( | ||
| RepairOrderLineItem, | ||
| on_delete=models.CASCADE, | ||
| related_name='allocations', | ||
| verbose_name=_('Line Item'), | ||
| ) | ||
|
|
||
| item = models.ForeignKey( | ||
| 'stock.StockItem', | ||
| on_delete=models.CASCADE, | ||
| related_name='repair_order_allocations', | ||
| verbose_name=_('Stock Item'), | ||
| ) | ||
|
|
||
| quantity = models.DecimalField( | ||
| max_digits=15, | ||
| decimal_places=5, | ||
| default=1, | ||
| verbose_name=_('Quantity'), | ||
| help_text=_('Allocated stock quantity'), | ||
| ) | ||
|
|
||
| @staticmethod | ||
| def get_api_url(): | ||
| """Return the API URL associated with the RepairOrderAllocation model.""" | ||
| return reverse('api-repair-order-allocation-list') | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am missing a permissions class here