Skip to content
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

Lógica para update #67

Merged
merged 3 commits into from
Mar 24, 2023
Merged

Lógica para update #67

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8714e76
elements for update logic
rdahis Mar 21, 2023
77baab7
validation for datetime entity, makes fields optional
rdahis Mar 22, 2023
43dc37c
fix: allow for null year
rdahis Mar 24, 2023
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
123 changes: 73 additions & 50 deletions basedosdados_api/api/v1/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,24 +330,32 @@ def get_success_url(self):
return reverse("datasetdetail", kwargs={"pk": self.object.pk})


class UpdateFrequency(BdmModel):
class Update(BdmModel):
id = models.UUIDField(primary_key=True, default=uuid4)
entity = models.ForeignKey(
"Entity", on_delete=models.CASCADE, related_name="update_frequencies"
"Entity", on_delete=models.CASCADE, related_name="updates"
)
number = models.IntegerField()
frequency = models.IntegerField()
lag = models.IntegerField(blank=True, null=True)
last = models.DateTimeField(blank=True, null=True)

graphql_nested_filter_fields_whitelist = ["id"]

def __str__(self):
return f"{str(self.number)} {str(self.entity)}"

class Meta:
db_table = "update_frequency"
verbose_name = "Update Frequency"
verbose_name_plural = "Update Frequencies"
db_table = "update"
verbose_name = "Update"
verbose_name_plural = "Updates"
ordering = ["number"]

def clean(self) -> None:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfagundes tá correta a escrita dessa validação?

if self.entity.category.slug != "datetime":
raise ValidationError(
"Entity's category is not in category.slug = `datetime`."
)
return super().clean()

class Table(BdmModel):
id = models.UUIDField(primary_key=True, default=uuid4)
Expand All @@ -370,8 +378,12 @@ class Table(BdmModel):
partner_organization = models.ForeignKey(
"Organization", on_delete=models.CASCADE, related_name="partner_tables"
)
update_frequency = models.ForeignKey(
"UpdateFrequency", on_delete=models.CASCADE, related_name="tables"
update = models.ForeignKey(
"Update",
on_delete=models.CASCADE,
related_name="tables",
null=True,
blank=True,
)
pipeline = models.ForeignKey(
"Pipeline", on_delete=models.CASCADE, related_name="tables"
Expand Down Expand Up @@ -589,8 +601,12 @@ class RawDataSource(BdmModel):
license = models.ForeignKey(
"License", on_delete=models.CASCADE, related_name="raw_data_sources"
)
update_frequency = models.ForeignKey(
"UpdateFrequency", on_delete=models.CASCADE, related_name="raw_data_sources"
update = models.ForeignKey(
"Update",
on_delete=models.CASCADE,
related_name="raw_data_sources",
null=True,
blank=True,
)
area_ip_address_required = models.ManyToManyField(
"Area", related_name="raw_data_sources", blank=True
Expand Down Expand Up @@ -619,8 +635,12 @@ class InformationRequest(BdmModel):
status = models.ForeignKey(
"Status", on_delete=models.CASCADE, related_name="information_requests"
)
update_frequency = models.ForeignKey(
"UpdateFrequency", on_delete=models.CASCADE, related_name="information_requests"
update = models.ForeignKey(
"Update",
on_delete=models.CASCADE,
related_name="information_requests",
null=True,
blank=True,
)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
Expand Down Expand Up @@ -770,51 +790,54 @@ class DateTimeRange(BdmModel):
graphql_nested_filter_fields_whitelist = ["id"]

def __str__(self):
start_year = self.start_year or ""
start_month = f"-{self.start_month}" if self.start_month else ""
start_day = f"-{self.start_day}" if self.start_day else ""
start_hour = f" {self.start_hour}" if self.start_hour else ""
start_minute = f":{self.start_minute}" if self.start_minute else ""
start_second = f":{self.start_second}" if self.start_second else ""
end_year = self.end_year or ""
end_month = f"-{self.end_month}" if self.end_month else ""
end_day = f"-{self.end_day}" if self.end_day else ""
end_hour = f" {self.end_hour}" if self.end_hour else ""
end_minute = f":{self.end_minute}" if self.end_minute else ""
interval = f"({self.interval})" if self.interval else "()"
return f"{start_year}{start_month}{start_day}{start_hour}{start_minute}{start_second}{interval}\
{end_year}{end_month}{end_day}{end_hour}{end_minute}"
#start_year = self.start_year or ""
#start_month = f"-{self.start_month}" if self.start_month else ""
#start_day = f"-{self.start_day}" if self.start_day else ""
#start_hour = f" {self.start_hour}" if self.start_hour else ""
#start_minute = f":{self.start_minute}" if self.start_minute else ""
#start_second = f":{self.start_second}" if self.start_second else ""
#end_year = self.end_year or ""
#end_month = f"-{self.end_month}" if self.end_month else ""
#end_day = f"-{self.end_day}" if self.end_day else ""
#end_hour = f" {self.end_hour}" if self.end_hour else ""
#end_minute = f":{self.end_minute}" if self.end_minute else ""
#end_second = f":{self.end_second}" if self.end_second else ""
#interval = f"({self.interval})" if self.interval else "()"
#return f"{start_year}-{start_month}-{start_day} {start_hour}:{start_minute}:{start_second}({interval})\
# {end_year}-{end_month}-{end_day} {end_hour}:{end_minute}:{end_second}"
return self.id # TODO smarter string for cases when fields are null (year, month, etc)

def clean(self) -> None:
errors = {}

if (self.start_year and self.end_year) and self.start_year > self.end_year:
errors["start_year"] = ["Start year cannot be greater than end year"]

try:
start_datetime = datetime(
self.start_year,
self.start_month or 1,
self.start_day or 1,
self.start_hour or 0,
self.start_minute or 0,
self.start_second or 0,
)
end_datetime = datetime(
self.end_year,
self.end_month or 1,
self.end_day or 1,
self.end_hour or 0,
self.end_minute or 0,
self.end_second or 0,
)
if start_datetime > end_datetime:
errors["start_year"] = [
"Start datetime cannot be greater than end datetime"
]

except TypeError:
errors["start_year"] = ["Start year or end year are invalid"]
if (self.start_year and self.end_year):
try:
start_datetime = datetime(
self.start_year,
self.start_month or 1,
self.start_day or 1,
self.start_hour or 0,
self.start_minute or 0,
self.start_second or 0,
)
end_datetime = datetime(
self.end_year,
self.end_month or 1,
self.end_day or 1,
self.end_hour or 0,
self.end_minute or 0,
self.end_second or 0,
)
if start_datetime > end_datetime:
errors["start_year"] = [
"Start datetime cannot be greater than end datetime"
]

except TypeError:
errors["start_year"] = ["Start year or end year are invalid"]

if self.start_day:
max_day = calendar.monthrange(self.start_year, self.start_month)[1]
Expand Down