fix: event import #5514

YogeshSharma0201 · 2019-01-10T17:40:38Z

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

Short description of what this resolves:

Import Event api is working now and through /import-jobs api Import jobs list can be retrieved and displayed on frontend.

Changes proposed in this pull request:

Event Model is fixed so that it accepts event_orga_id
Import Jobs schema and api added.
Added apiblueprint for import jobs api
Import Jobs relationship are not added in the schema as it was not necessary for this PR, Let me know if that is required too.

app/api/schema/import_jobs.py

app/api/import_jobs.py

codecov · 2019-01-10T18:01:15Z

Codecov Report

Merging #5514 into development will increase coverage by 1.12%.
The diff coverage is 82.22%.

@@               Coverage Diff               @@
##           development    #5514      +/-   ##
===============================================
+ Coverage        65.57%   66.69%   +1.12%     
===============================================
  Files              277      286       +9     
  Lines            13439    13876     +437     
===============================================
+ Hits              8812     9255     +443     
+ Misses            4627     4621       -6

Impacted Files	Coverage Δ
app/api/imports.py	`34.61% <0%> (ø)`	⬆️
app/api/schema/import_jobs.py	`100% <100%> (ø)`
app/api/__init__.py	`100% <100%> (ø)`	⬆️
app/models/event.py	`81.49% <100%> (+0.37%)`	⬆️
app/api/helpers/import_helpers.py	`27.38% <50%> (+9.42%)`	⬆️
app/api/import_jobs.py	`83.33% <83.33%> (ø)`
app/models/setting.py	`90.07% <0%> (-2.73%)`	⬇️
tests/all/unit/api/helpers/test_storage.py	`97.29% <0%> (-2.71%)`	⬇️
app/api/users.py	`33.55% <0%> (-1.17%)`	⬇️
app/api/helpers/payment.py	`25.3% <0%> (-0.95%)`	⬇️
... and 37 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be60472...311e585. Read the comment docs.

abhinavk96

Resolve the codacy issues please

YogeshSharma0201 · 2019-01-30T15:34:27Z

@CosmicCoder96 do you think these codacy issues need to be fixed? i cannot change variable name 'id' and no methods are currently required in impor_job schema.

app/api/helpers/utilities.py

docs/api/api_blueprint.apib

iamareebjamal

URL issues

abhinavk96 · 2019-03-23T19:53:13Z

@YogeshSharma0201 update this please

app/api/import_jobs.py

YogeshSharma0201 · 2019-03-26T08:10:36Z

@CosmicCoder96 please review

app/api/__init__.py

abhinavk96 · 2019-04-02T18:28:37Z

app/api/helpers/import_helpers.py

-            path + '/social_links',
-            json.dumps(data.get('social_links', []))
-        )  # save social_links
+        with open(path + '/social_links', 'w') as file:


@CosmicCoder96 i can't use write_file() because it tries to encode the data in utf-8 which gives errors.

What errors?

@iamareebjamal error: decoding str is not supported

app/api/import_jobs.py

app/api/schema/import_jobs.py

docs/api/api_blueprint.apib

abhinavk96 · 2019-04-07T15:22:05Z

@YogeshSharma0201 updates?

app/api/import_jobs.py

app/api/helpers/import_helpers.py

…nto fix_event_import

YogeshSharma0201 · 2019-04-14T05:57:00Z

@CosmicCoder96 please review

abhinavk96 · 2019-05-12T03:46:44Z

@iamareebjamal Can you help out with the error mentioned by @YogeshSharma0201. What could be a possible solution?

iamareebjamal · 2019-05-13T08:10:03Z

write_file takes bytes as argument and json.dumps returns string.

Add .encode('utf-8') after json.dumps call

json.dumps(data.get(..., [])).encode('utf-8')

abhinavk96 · 2019-05-14T06:39:58Z

@YogeshSharma0201 Please update this now with the fix mentioned by @iamareebjamal

houndci-bot · 2019-05-14T08:44:18Z

app/api/helpers/import_helpers.py

-            json.dumps(data.get('social_links', []))
-        )  # save social_links
+            json.dumps(data.get('social_links', [])).encode('utf-8')
+        ) # save social_links


at least two spaces before inline comment

YogeshSharma0201 added 2 commits January 10, 2019 21:21

fix event import

3c016b7

merge development and fix conflicts

82e14cc

houndci-bot reviewed Jan 10, 2019

View reviewed changes

app/api/schema/import_jobs.py Outdated Show resolved Hide resolved

app/api/schema/import_jobs.py Outdated Show resolved Hide resolved

app/api/import_jobs.py Outdated Show resolved Hide resolved

app/api/import_jobs.py Outdated Show resolved Hide resolved

YogeshSharma0201 mentioned this pull request Jan 10, 2019

Fix Event Imports fossasia/open-event-frontend#1788

Merged

5 tasks

houndci-bot reviewed Jan 10, 2019

View reviewed changes

app/api/import_jobs.py Show resolved Hide resolved

YogeshSharma0201 force-pushed the fix_event_import branch from 96b1a7e to 2275779 Compare January 10, 2019 18:02

YogeshSharma0201 mentioned this pull request Jan 22, 2019

Fix import helper and Event model #5531

Closed

6 tasks

abhinavk96 suggested changes Jan 28, 2019

View reviewed changes

YogeshSharma0201 force-pushed the fix_event_import branch from 864ae11 to e545481 Compare January 29, 2019 07:41

iamareebjamal reviewed Jan 30, 2019

View reviewed changes

app/api/helpers/utilities.py Outdated Show resolved Hide resolved

iamareebjamal reviewed Jan 30, 2019

View reviewed changes

docs/api/api_blueprint.apib Outdated Show resolved Hide resolved

iamareebjamal requested changes Jan 30, 2019

View reviewed changes

hound_fix

fcdb920

YogeshSharma0201 force-pushed the fix_event_import branch from e545481 to efbb267 Compare March 26, 2019 07:56

houndci-bot reviewed Mar 26, 2019

View reviewed changes

YogeshSharma0201 force-pushed the fix_event_import branch from efbb267 to 3269d29 Compare March 26, 2019 08:04

fossasia deleted a comment Mar 26, 2019

abhinavk96 suggested changes Apr 2, 2019

View reviewed changes

YogeshSharma0201 force-pushed the fix_event_import branch from 3269d29 to 9234793 Compare April 8, 2019 08:33

houndci-bot reviewed Apr 8, 2019

View reviewed changes

app/api/import_jobs.py Outdated Show resolved Hide resolved

app/api/import_jobs.py Outdated Show resolved Hide resolved

app/api/helpers/import_helpers.py Outdated Show resolved Hide resolved

app/api/helpers/import_helpers.py Outdated Show resolved Hide resolved

Merge branch 'development' of github.com:fossasia/open-event-server i…

39ebcac

…nto fix_event_import

YogeshSharma0201 force-pushed the fix_event_import branch 2 times, most recently from cc7eb99 to 30f97aa Compare April 8, 2019 08:53

Merge developement and resolve conflicts

a68ce32

YogeshSharma0201 force-pushed the fix_event_import branch from 30f97aa to a68ce32 Compare April 8, 2019 08:55

Update import_helpers.py

d241980

houndci-bot reviewed May 14, 2019

View reviewed changes

iamareebjamal added 2 commits May 14, 2019 14:15

Update import_helpers.py

e571707

Update import_helpers.py

311e585

abhinavk96 approved these changes May 14, 2019

View reviewed changes

iamareebjamal approved these changes May 14, 2019

View reviewed changes

iamareebjamal changed the title ~~Fix event import~~ fix: event import May 14, 2019

auto-label bot added the fix label May 14, 2019

iamareebjamal merged commit e942a88 into fossasia:development May 14, 2019

abhinavk96 mentioned this pull request Jun 16, 2019

Fix import event api endpoint and Add api to access Import Jobs #5513

Closed

fix: event import #5514

fix: event import #5514

Uh oh!

Conversation

YogeshSharma0201 commented Jan 10, 2019

Checklist

Short description of what this resolves:

Changes proposed in this pull request:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jan 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

abhinavk96 left a comment

Choose a reason for hiding this comment

Uh oh!

YogeshSharma0201 commented Jan 30, 2019

Uh oh!

Uh oh!

Uh oh!

iamareebjamal left a comment

Choose a reason for hiding this comment

Uh oh!

abhinavk96 commented Mar 23, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

YogeshSharma0201 commented Mar 26, 2019

Uh oh!

Uh oh!

Uh oh!

abhinavk96 Apr 2, 2019

Choose a reason for hiding this comment

Uh oh!

YogeshSharma0201 Apr 8, 2019

Choose a reason for hiding this comment

Uh oh!

iamareebjamal Apr 8, 2019

Choose a reason for hiding this comment

Uh oh!

YogeshSharma0201 Apr 8, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

abhinavk96 commented Apr 7, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

YogeshSharma0201 commented Apr 14, 2019

Uh oh!

abhinavk96 commented May 12, 2019

Uh oh!

iamareebjamal commented May 13, 2019

Uh oh!

abhinavk96 commented May 14, 2019

Uh oh!

houndci-bot May 14, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

codecov bot commented Jan 10, 2019 •

edited

Loading

YogeshSharma0201 Apr 8, 2019 •

edited

Loading