Add salary_currency field to Job model; update serializers and views for salary processing

Author: lalalaurentiu

scraper_Api/jobs/migrations/0010_job_salary_currency.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.9 on 2026-03-14 00:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jobs', '0009_replace_salary_with_min_max'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='job',
+            name='salary_currency',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+    ]

scraper_Api/jobs/models.py

@@ -14,6 +14,7 @@ class Job(models.Model):
     job_title = models.TextField()
     salary_min = models.IntegerField(blank=True, null=True)
     salary_max = models.IntegerField(blank=True, null=True)
+    salary_currency = models.CharField(max_length=10, blank=True, null=True)
     remote = models.CharField(max_length=50, blank=True)
     edited = models.BooleanField(default=False)
     published = models.BooleanField(default=False)

scraper_Api/jobs/serializer.py

@@ -12,13 +12,31 @@ class JobAddSerializer(serializers.ModelSerializer):
     class Meta:
         model = Job
         fields = ['job_link', 'job_title', 'company', 'country',
-                  'city', 'county', 'salary', 'salary_min', 'salary_max', 'remote', 'job_id', 'company_name']
+                  'city', 'county', 'salary', 'salary_min', 'salary_max', 'salary_currency', 'remote', 'job_id', 'company_name']
 
     def validate(self, attrs):
         salary = attrs.pop('salary', None)
 
         if salary and attrs.get('salary_min') is None and attrs.get('salary_max') is None:
-            salary_parts = [part.strip() for part in str(salary).replace('RON', '').replace('ron', '').split('-')]
+            salary_text = str(salary).strip()
+            salary_upper = salary_text.upper()
+            currency_map = {
+                'RON': 'RON',
+                'LEI': 'RON',
+                'LEU': 'RON',
+                'EUR': 'EUR',
+                'EURO': 'EUR',
+                'USD': 'USD',
+                'GBP': 'GBP',
+            }
+
+            if not attrs.get('salary_currency'):
+                for token, normalized_currency in currency_map.items():
+                    if token in salary_upper:
+                        attrs['salary_currency'] = normalized_currency
+                        break
+
+            salary_parts = [part.strip() for part in salary_upper.replace('RON', '').replace('LEI', '').replace('LEU', '').replace('EUR', '').replace('EURO', '').replace('USD', '').replace('GBP', '').split('-')]
             numeric_parts = []
 
             for part in salary_parts:
@@ -36,6 +54,9 @@ def validate(self, attrs):
             if attrs['salary_min'] > attrs['salary_max']:
                 raise serializers.ValidationError('salary_min cannot be greater than salary_max')
 
+        if attrs.get('salary_currency'):
+            attrs['salary_currency'] = str(attrs['salary_currency']).strip().upper()
+
         return attrs
 
     def create(self, validated_data):
@@ -78,7 +99,7 @@ class GetJobSerializer(serializers.ModelSerializer):
     class Meta:
         model = Job
         fields = ['id','job_link', 'job_title', 'company', 'country', 'city',
-                  'county', 'salary_min', 'salary_max', 'remote', 'edited', 'published', 'posted', 'company_name']
+                  'county', 'salary_min', 'salary_max', 'salary_currency', 'remote', 'edited', 'published', 'posted', 'company_name']
 
     def get_company_name(self, obj):
         return obj.company.company

scraper_Api/jobs/views.py

@@ -54,6 +54,7 @@ def transformed_jobs(self, jobs):
                     "salary": self.transform_data(job.get("salary")),
                     "salary_min": job.get("salary_min"),
                     "salary_max": job.get("salary_max"),
+                    "salary_currency": self.transform_data(job.get("salary_currency")),
                     "remote": self.transform_data(job.get("remote")),
                     "company": self.transform_data(job.get("company")).title(),
                     "companyId": job.get("companyId"),

scraper_Api/mobile/views.py

@@ -82,14 +82,18 @@ def get(self, _):
 @permission_classes([AllowAny])
 class GetTotalJobs(APIView):
     def get(self, _):
-        total_jobs = Job.objects.filter(published=True).count()
+        published_jobs = Job.objects.filter(published=True)
+        total_jobs = published_jobs.count()
+        salary_floor_job = published_jobs.filter(salary_min__gt=0).exclude(salary_currency__isnull=True).exclude(salary_currency='').order_by('salary_currency', 'salary_min').values('salary_min', 'salary_currency').first()
         companies = sorted({
             company.strip()
             for company in Company.objects.values_list('company', flat=True)
             if company and company.strip()
         })
         return Response({
             "total": total_jobs,
+            "salary_floor": salary_floor_job.get('salary_min') if salary_floor_job else None,
+            "salary_floor_currency": salary_floor_job.get('salary_currency') if salary_floor_job else None,
             "companies": companies,
             "companies_count": len(companies),
         })