Skip to content

Commit 492feeb

Browse files
Merge pull request #2205 from IFRCGo/fix/sentry-issue
Fix Sentry issues
2 parents 6c59164 + 8675641 commit 492feeb

File tree

2 files changed

+47
-2
lines changed

2 files changed

+47
-2
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Generated by Django 4.2.13 on 2024-07-09 04:48
2+
3+
from django.db import migrations
4+
5+
6+
def delete_ids(apps, schema_editor):
7+
CountryDirectory = apps.get_model("api", "CountryDirectory")
8+
CountryKeyDocument = apps.get_model("api", "CountryKeyDocument")
9+
NSDInitiatives = apps.get_model("api", "NSDInitiatives")
10+
try:
11+
CountryDirectory.objects.all().delete()
12+
CountryKeyDocument.objects.all().delete()
13+
NSDInitiatives.objects.all().delete()
14+
except Exception as e:
15+
print("Error while deleting ids", str(e))
16+
17+
18+
class Migration(migrations.Migration):
19+
20+
dependencies = [
21+
("api", "0210_profile_accepted_montandon_license_terms"),
22+
]
23+
24+
operations = [
25+
migrations.RunPython(delete_ids, reverse_code=migrations.RunPython.noop),
26+
migrations.AlterUniqueTogether(
27+
name="countrydirectory",
28+
unique_together={("country", "first_name", "last_name", "position")},
29+
),
30+
migrations.AlterUniqueTogether(
31+
name="countrykeydocument",
32+
unique_together={("country", "url")},
33+
),
34+
migrations.AlterUniqueTogether(
35+
name="nsdinitiatives",
36+
unique_together={("country", "year", "fund_type")},
37+
),
38+
]

api/models.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ class CountryDirectory(models.Model):
314314
last_name = models.CharField(verbose_name=_("Last Name"), max_length=255, null=True, blank=True)
315315
position = models.CharField(verbose_name=_("Position"), max_length=255, null=True, blank=True)
316316

317+
class Meta:
318+
unique_together = ("country", "first_name", "last_name", "position")
319+
317320
def __str__(self):
318321
return f"{self.country.name} - {self.first_name}"
319322

@@ -349,7 +352,9 @@ class CountryKeyDocument(models.Model):
349352
end_year = models.DateField(verbose_name=_("End Year"), null=True, blank=True)
350353
year_text = models.CharField(verbose_name=_("Year Text"), max_length=255, null=True, blank=True)
351354

352-
# TODO: Add unique_together country, url
355+
class Meta:
356+
unique_together = ("country", "url")
357+
353358
def __str__(self):
354359
return f"{self.country.name} - {self.name}"
355360

@@ -392,7 +397,9 @@ class NSDInitiatives(models.Model):
392397
funding_period = models.IntegerField(verbose_name=_("Funding Period in Month"))
393398
categories = ArrayField(models.CharField(max_length=255), verbose_name=_("Funding categories"), default=list, null=True)
394399

395-
# TODO: Add unique_together country, year, fund_type
400+
class Meta:
401+
unique_together = ("country", "year", "fund_type")
402+
396403
def __str__(self):
397404
return f"{self.country.name} - {self.title}"
398405

0 commit comments

Comments
 (0)