-
Notifications
You must be signed in to change notification settings - Fork 27
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
Timestamp for PersonImage #2413
Merged
+99
−2
Merged
Changes from all commits
Commits
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 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
58 changes: 58 additions & 0 deletions
58
ynr/apps/people/migrations/0047_alter_personimage_options_personimage_created_and_more.py
This file contains 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,58 @@ | ||
# Generated by Django 4.2.11 on 2024-07-02 13:44 | ||
|
||
import django.utils.timezone | ||
import django_extensions.db.fields | ||
from django.db import migrations | ||
|
||
|
||
def get_timestamp_from_queued_image(apps, schema_editor): | ||
"""Set the created and modified timestamps on the image | ||
to the timestamp of the first and last approved queued image""" | ||
|
||
PersonImage = apps.get_model("people", "PersonImage") | ||
for personimage in PersonImage.objects.all(): | ||
person = personimage.person | ||
queued_images = person.queuedimage_set.all() | ||
if not queued_images: | ||
continue | ||
modified = queued_images.filter(decision="approved").last().updated | ||
created = queued_images.filter(decision="approved").last().created | ||
if modified: | ||
personimage.modified = modified | ||
personimage.created = created | ||
personimage.save() | ||
|
||
|
||
class Migration(migrations.Migration): | ||
dependencies = [ | ||
("people", "0046_alter_personidentifier_unique_together"), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterModelOptions( | ||
name="personimage", | ||
options={"get_latest_by": "modified"}, | ||
), | ||
migrations.AddField( | ||
model_name="personimage", | ||
name="created", | ||
field=django_extensions.db.fields.CreationDateTimeField( | ||
auto_now_add=True, | ||
default=django.utils.timezone.now, | ||
verbose_name="created", | ||
), | ||
preserve_default=False, | ||
), | ||
migrations.AddField( | ||
model_name="personimage", | ||
name="modified", | ||
field=django_extensions.db.fields.ModificationDateTimeField( | ||
auto_now=True, verbose_name="modified" | ||
), | ||
), | ||
( | ||
migrations.RunPython( | ||
get_timestamp_from_queued_image, migrations.RunPython.noop | ||
) | ||
), | ||
] |
This file contains 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 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
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.
BST problems? I tried this again with
freeze_time
and also changed the migration update and created default todatetime.now(timezone.utc).isoformat()
but got the same error.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.
Is this working now? CI seems ok?
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.
No, I don't think so - it's a mismatch in the time.
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've pushed a commit that fixes this, but I'm a little confused as to why we're not getting the right timezone back from
pi.modified
. In my understanding, the model should store the timezone and return local time, but maybe that's not how it works.