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

Jump to bottom

Sync with upstream to tag 2.018.48 #29

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Sync with upstream to tag 2.018.48 #29

wants to merge 44 commits into from

Conversation

Tomatosoup97
Copy link

@Tomatosoup97 Tomatosoup97 commented Jan 27, 2019 •
edited
Loading

  • Run update_is_sync_with_mongo command to populate is_synced_with_mongo property of Instance model
  • Run update_is_sync_with_mongo command to update new char field media_file_basename
  • Ensure KPI_INTERNAL_URL env var is set:
    KPI_INTERNAL_URL = os.environ.get("KPI_INTERNAL_URL", KPI_URL)
  • There is added posted_to_kpi variable to xform, we need to make sure it gets populated properly

noliveleger and others added 30 commits June 21, 2018 14:09
@noliveleger
Added 'has_kpi_hooks' boolean field to 'XForm' model and 'mongo_succe…
d038f11 
…ss' boolean field to 'Instance' model
@noliveleger
Renamed 'mongo_success' to 'is_sync_with_mongo'. Update its value on …
ec2694b 
…ParsedInstance.save()
@noliveleger
New rest service for KPI and (un)register it on XForm.save()
0e8b298
@noliveleger
Use KPI_INTERNAL_URL to make call between KC and KPI in Rest Service
9f83d34
@noliveleger
Updated pip requirements. Requests 2.4.1 > Request 2.19.1
e10b8c0
@noliveleger
Updated 'kpi_hook' service to post 'xml' and 'json' to kpi endpoint
b14da18
@noliveleger
Added XML representation of an instance in API endpoint
0ceccc7
@noliveleger
Added XML format in Instance detail endpoint
bf66b77
@noliveleger
Added instance_id in payload of kpi_hook service, renamed uuid to uid…
6969e3e 
… to be consistent with the kpi code
@noliveleger
Changed json representation to match Mongo data
576b7dd
@noliveleger
Removed logger_instance.uid from kpi_hook payload
c5d97fb
@noliveleger
Moved rest_service process to a Celery task
fc4a6f6
@noliveleger
Updated remongo & sync mongo command to handle is_synced_with_mongo f…
4962943 
…ield, added command to update is_synced_with_mongo according to Mongo records
@noliveleger
Changed Instance.save() to update only with need fields
a3eb2d2
@noliveleger
Removed useless and redundant Instance.save(), fixed sync_mongo --all…
5194de4 
… for inactive XForm
@noliveleger
Send only UUID to kpi hook service
a14f388
@noliveleger
Bugfix when saving kpi_hook result
5f67122
@jnm
Refactor submission counting without locking
9615617
@noliveleger
Merge pull request kobotoolbox#479 from kobotoolbox/remove-submission…
24ce281 
…-count-locks

Refactor submission counting without locking
@jnm
Remove SPSS label export feature
f4fb829 
which is now provided by formpack via KPI
@jnm
Upgrade pyxform to 0.11.5; closes kobotoolbox#480
f439a21
@jnm
Merge remote-tracking branch 'origin/master' into kpi_rest_services
fb334b3
@noliveleger
Merge pull request kobotoolbox#481 from kobotoolbox/480-upstream-pyxform
3dd4778 
 Upgrade pyxform to 0.11.5; closes kobotoolbox#480
@noliveleger
Changed Instance.save() to Instance.objects.update() to gain performance
0c0f55d
@noliveleger
Merge branch 'kpi_rest_services' of github.com:kobotoolbox/kobocat in…
5102a15 
…to kpi_rest_services
@noliveleger
Send instance_id instead of instance_uuid to KPI
4038ebd
@noliveleger
update_is_sync_with_mongo - Order queryset by id
f0dcf51
@jnm
Merge pull request kobotoolbox#482 from kobotoolbox/kpi_rest_services
f73476d 
Branch to be used with `kpi`.`REST-UI`
@jnm
Disable automatic export creation in export_list
40c67f2 
Exports can still be generated with the "New Export" button. Closes kobotoolbox#484
@noliveleger
Merge pull request kobotoolbox#485 from kobotoolbox/484-no-auto-export
ad21245 
Disable automatic export creation in `export_list`
jnm and others added 14 commits October 25, 2018 03:16
@jnm
Just get the XForm: don't bother counting first!
877e155
@jnm
Do not lock any rows until attachments are saved
8370d27 
Try not to do any locking until as close as possible to the end of the
transaction. Closes kobotoolbox#490
@noliveleger
Merge pull request kobotoolbox#491 from kobotoolbox/490-optimize-subm…
504fbb9 
…ission-count-locking

Do not lock any rows until attachments are saved
@jnm
Add a new media_file_basename column to improve
75eb550 
performance when a single `auth_user` has may rows in `logger_attachment`. This
commit lacks a management command to populate the `media_file_basename` column,
but we'll say that it closes kobotoolbox#495.
@noliveleger
Merge pull request kobotoolbox#496 from kobotoolbox/495-media-file-qu…
39c0996 
…ery-optimization

Add a new `media_file_basename` column to improve
@jnm
Remove Fabric configuration. Closes kobotoolbox#497
93cea58
@noliveleger
Merge pull request kobotoolbox#498 from kobotoolbox/497-remove-fabric…
31a067e 
…-configuration

Remove Fabric configuration. Closes kobotoolbox#497
@noliveleger
Bug fix for 'media_file_basename' always saved as empty string
ed1b011
@noliveleger
Management command to update 'media_file_basename'
4549276
@noliveleger
Use already existing 'filename' property' to initialize 'media_file_b…
85244d0 
…asename' field
@jnm
Merge pull request kobotoolbox#501 from kobotoolbox/500-images-collec…
f48dba1 
…ted-not-found

500 images collected not found - fix
@noliveleger
Applied PR#501 suggested changes
43f8e1e
@noliveleger
Merge pull request kobotoolbox#503 from kobotoolbox/500-images-not-fo…
b2d8d13 
…und-PR-changes

Applied PR#501 suggested changes
@Tomatosoup97
Merge branch 'upstream-2.018.48' into update-upstream-2.018.48
6096284
@Tomatosoup97 Tomatosoup97 added the WIP Work In Progress label Jan 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
WIP Work In Progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Tomatosoup97 @noliveleger @jnm