Fixes #790: API now generates badges #791

gabru-md · 2018-05-18T10:31:50Z

Fixes #790

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.
I have added necessary documentation (if appropriate)

Preview Link

Replace XXX with your PR no
Link to live demo: http://pr-XXX-fossasia-badgeyay.surge.sh

Changes proposed in this pull request:

This PR contains the code for generating badges from the new API.

Thank You!

gabru-md · 2018-05-18T10:32:32Z

@harshit98 @djmgit @ParthS007 @yashLadha
@vaibhavsingh97 review please.

open-event-bot · 2018-05-18T10:40:56Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1621.1 has failed

open-event-bot · 2018-05-18T10:42:56Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1620.1 has failed

open-event-bot · 2018-05-18T10:56:19Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1622.1 has failed

open-event-bot · 2018-05-18T10:58:30Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1623.1 has failed

open-event-bot · 2018-05-18T11:01:07Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1624.1 has failed

gabru-md · 2018-05-18T11:07:52Z

Here is a video for you to review.

Thanks

codecov · 2018-05-18T11:15:21Z

Codecov Report

Merging #791 into development will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           development   #791   +/-   ##
==========================================
  Coverage          100%   100%           
==========================================
  Files                1      1           
  Lines               43     43           
==========================================
  Hits                43     43

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 f550271...7653eb8. Read the comment docs.

djmgit · 2018-05-18T15:03:01Z

backend/blueprint/api/controllers/generateBadges.py

 from api.utils.response import Response
+from api.utils.svg_to_png import SVG2PNG
+from api.utils.merge_badges import MergeBadges
+

 router = Blueprint('generateBadges', __name__)



please remove this extra line

open-event-bot · 2018-05-18T15:11:09Z

Hi @gabru-md!

It looks like one or more of your builds have failed.
I've added the relevant info below to save you some time.

Build 1630.1 has failed

gabru-md · 2018-05-18T15:12:56Z

@djmgit the change you have suggested is failing the build. So I am reverting it.
I guess it is okay? 😄

djmgit · 2018-05-18T15:17:34Z

backend/blueprint/api/controllers/generateBadges.py

+                'Could not find any JSON'))
+
+    csv_name = data['csv']
+    image_name = data['image']


use data.get() format to avoid exception

djmgit · 2018-05-18T15:18:22Z

backend/blueprint/api/controllers/generateBadges.py

+                str(e),
+                'Could not find any JSON'))
+
+    csv_name = data['csv']


please check for the availability of minimum required parameters and raise required error responses

djmgit · 2018-05-18T15:19:16Z

backend/blueprint/api/models/file.py

@@ -4,8 +4,8 @@
 class File(db.Model):
    __tablename__ = 'File'

-    filename = db.Column(db.String(100), NULLABLE=False)
-    filetype = db.Coloumn(db.string(100), NULLABLE=False)
+    filename = db.Column(db.String(100), nullable=False, primary_key=True)


How can you set filename as primary key? How are you making sure that it will be unique?

uuid.uuid4 and uuid.uuid1 provide unique names always.
I already had it discussed with @yashLadha and @ParthS007 since they raised the same doubt

and we are using uuid.uuid4 for generating the names. therefore it will always be unique.

djmgit

Please see comments inline

gabru-md · 2018-05-18T15:25:58Z

@djmgit please review again. I've made the changes.

This PR has added generating badges functionality implemented from scratch. Cheers! removed my config Fixes Travis fix modifies .gitignore foe firebase Adds fix for travis Fixes Coadcy Errors Removes Extra Line revert Made Changes

djmgit

@gabru-md what about the manually entered data? I mean when no csv is there, people can enter data manually right? What about that. We also need a parameter for that.

gabru-md · 2018-05-19T01:09:20Z

@djmgit for the manual data we will first save it into a CSV and then apply the same method for generation of badges.
Why save to CSV first?
Since we have to make a Badge Management Portal, we will need to store that input somewhere or the other. So Saving that maunal input as a CSV and then following the same above steps will ensure that the API works properly for us in present and as well as the future.
For saving the manual input we will require an extra route, since we are making separate components on the frontend to deal with separate things, therefore we require separate api routes to collect the data from them as well, just like in case of open event server.

I am creating an issue for the same and will send a PR by the end of the day. In this way, the current proposed badge making functionality will remain isolated from the fact that the input was manual or csv. As we can see in the previous version it caused a lot of ifs and elses which made the code less maintainable as well. Meanwhile this can be merged, and I will work on accepting the manual data on a separate route.

Please merge this @djmgit
thank you 😃

open-event-bot bot added the needs-review label May 18, 2018

open-event-bot bot assigned gabru-md May 18, 2018

gabru-md force-pushed the generate_badges branch from f7e8131 to d53b937 Compare May 18, 2018 10:34

gabru-md force-pushed the generate_badges branch from 64541e1 to 31faca7 Compare May 18, 2018 11:19

djmgit reviewed May 18, 2018

View reviewed changes

gabru-md force-pushed the generate_badges branch from 31faca7 to 8dc9db9 Compare May 18, 2018 15:05

gabru-md force-pushed the generate_badges branch from 8dc9db9 to 037ecc2 Compare May 18, 2018 15:13

djmgit reviewed May 18, 2018

View reviewed changes

Adds Generate Badges Functionality

7653eb8

This PR has added generating badges functionality implemented from scratch. Cheers! removed my config Fixes Travis fix modifies .gitignore foe firebase Adds fix for travis Fixes Coadcy Errors Removes Extra Line revert Made Changes

ParthS007 approved these changes May 18, 2018

View reviewed changes

gabru-md force-pushed the generate_badges branch from 747bccd to 7653eb8 Compare May 18, 2018 15:33

open-event-bot bot removed the needs-review label May 18, 2018

yashLadha approved these changes May 18, 2018

View reviewed changes

djmgit reviewed May 18, 2018

View reviewed changes

djmgit approved these changes May 19, 2018

View reviewed changes

djmgit merged commit 14a3830 into fossasia:development May 19, 2018

open-event-bot bot added the ready-to-ship label May 19, 2018

gabru-md deleted the generate_badges branch May 19, 2018 06:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #790: API now generates badges #791

Fixes #790: API now generates badges #791

gabru-md commented May 18, 2018 •

edited

gabru-md commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

gabru-md commented May 18, 2018 •

edited

codecov bot commented May 18, 2018 •

edited

djmgit May 18, 2018

open-event-bot bot commented May 18, 2018

gabru-md commented May 18, 2018

djmgit May 18, 2018

djmgit May 18, 2018

djmgit May 18, 2018

gabru-md May 18, 2018 •

edited

djmgit May 18, 2018

gabru-md May 18, 2018

djmgit left a comment

gabru-md commented May 18, 2018

djmgit left a comment

gabru-md commented May 19, 2018

Fixes #790: API now generates badges #791

Fixes #790: API now generates badges #791

Conversation

gabru-md commented May 18, 2018 • edited

Checklist

Preview Link

Changes proposed in this pull request:

gabru-md commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

open-event-bot bot commented May 18, 2018

gabru-md commented May 18, 2018 • edited

codecov bot commented May 18, 2018 • edited

Codecov Report

djmgit May 18, 2018

Choose a reason for hiding this comment

open-event-bot bot commented May 18, 2018

gabru-md commented May 18, 2018

djmgit May 18, 2018

Choose a reason for hiding this comment

djmgit May 18, 2018

Choose a reason for hiding this comment

djmgit May 18, 2018

Choose a reason for hiding this comment

gabru-md May 18, 2018 • edited

Choose a reason for hiding this comment

djmgit May 18, 2018

Choose a reason for hiding this comment

gabru-md May 18, 2018

Choose a reason for hiding this comment

djmgit left a comment

Choose a reason for hiding this comment

gabru-md commented May 18, 2018

djmgit left a comment

Choose a reason for hiding this comment

gabru-md commented May 19, 2018

gabru-md commented May 18, 2018 •

edited

gabru-md commented May 18, 2018 •

edited

codecov bot commented May 18, 2018 •

edited

gabru-md May 18, 2018 •

edited