Skip to content

Task 2545 - ICBC Upload User Notification #2571

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.

Sign up for GitHub

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

Merged
tim738745 merged 16 commits into from
Jan 22, 2026
Merged

Task 2545 - ICBC Upload User Notification #2571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2a897a9
Progress bar is more accurate to upload progress
dallascrichmond Jan 8, 2026
d6354d8
Added local storage tracking for upload state
dallascrichmond Jan 8, 2026
71483a4
Fixed 1 sonarcloud issue
dallascrichmond Jan 9, 2026
c83fdb7
Fixed 2nd issue
dallascrichmond Jan 9, 2026
f5edbcf
Refactored icbc_upload into smaller functions
dallascrichmond Jan 9, 2026
371e222
Last issue fixed
dallascrichmond Jan 9, 2026
9d6ab38
Added progress tracking to database
dallascrichmond Jan 15, 2026
b084c3d
Removed alteredFields from migration
dallascrichmond Jan 19, 2026
48e2ea6
Moved functions from viewsets to services
dallascrichmond Jan 19, 2026
88af4a8
Model inherits from Auditable
dallascrichmond Jan 19, 2026
af46d5a
Changed field to one-to-one corresponding with IcbcUploadDate
dallascrichmond Jan 19, 2026
6da946d
Removed raw sql
dallascrichmond Jan 20, 2026
5eb402e
Clean up
dallascrichmond Jan 20, 2026
528d754
Removed alteredFields on migration
dallascrichmond Jan 21, 2026
deb980d
Removed raw SQL
dallascrichmond Jan 21, 2026
933044c
some cleanup (#2580)
tim738745 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions backend/api/migrations/0013_auto_20260119_1148.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 3.2.25 on 2026-01-19 19:48

import db_comments.model_mixins
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('api', '0012_auto_20250131_1252'),
]

operations = [
migrations.CreateModel(
name='IcbcUploadProgress',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('create_timestamp', models.DateTimeField(auto_now_add=True, null=True)),
('create_user', models.CharField(default='SYSTEM', max_length=130)),
('update_timestamp', models.DateTimeField(auto_now=True, null=True)),
('update_user', models.CharField(max_length=130, null=True)),
('progress', models.IntegerField(default=0)),
('status_text', models.CharField(default='Starting...', max_length=255)),
('current_page', models.IntegerField(default=0)),
('total_pages', models.IntegerField(default=0)),
('complete', models.BooleanField(default=False)),
('error', models.TextField(blank=True, null=True)),
('results', models.JSONField(blank=True, null=True)),
('upload', models.OneToOneField(db_column='upload_id', on_delete=django.db.models.deletion.CASCADE, related_name='progress', to='api.icbcuploaddate')),
],
options={
'db_table': 'icbc_upload_progress',
},
bases=(models.Model, db_comments.model_mixins.DBComments),
),
]
1 change: 1 addition & 0 deletions backend/api/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from . import credit_transfer_history
from . import icbc_vehicle
from . import icbc_upload_date
from . import icbc_upload_progress
from . import notification, notification_subscription
from . import sales_evidence
from . import compliance_ratio
Expand Down
45 changes: 45 additions & 0 deletions backend/api/models/icbc_upload_progress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
from django.db import models
from auditable.models import Auditable
from api.models.icbc_upload_date import IcbcUploadDate


class IcbcUploadProgress(Auditable):
"""
Tracks the progress of ICBC data uploads.
"""
upload = models.OneToOneField(
IcbcUploadDate,
on_delete=models.CASCADE,
related_name='progress',
db_column='upload_id'
)
progress = models.IntegerField(
default=0
)
status_text = models.CharField(
max_length=255,
default='Starting...'
)
current_page = models.IntegerField(
default=0
)
total_pages = models.IntegerField(
default=0
)
complete = models.BooleanField(
default=False
)
error = models.TextField(
null=True,
blank=True
)
results = models.JSONField(
null=True,
blank=True
)

class Meta:
db_table = 'icbc_upload_progress'

def __str__(self):
return f"Upload {self.upload.id}: {self.progress}% - {self.status_text}"
23 changes: 23 additions & 0 deletions backend/api/serializers/icbc_upload_progress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from rest_framework import serializers
from api.models.icbc_upload_progress import IcbcUploadProgress


class IcbcUploadProgressSerializer(serializers.ModelSerializer):
status = serializers.CharField(source='status_text', read_only=True)
upload_id = serializers.IntegerField(source='upload.id', read_only=True)

class Meta:
model = IcbcUploadProgress
fields = [
'upload_id',
'progress',
'status',
'current_page',
'total_pages',
'complete',
'error',
'results',
'create_timestamp',
'update_timestamp'
]
read_only_fields = ['create_timestamp', 'update_timestamp']
Loading