Add telegram client #111

leddcode · 2021-01-21T16:08:44Z

No description provided.

…into telegram

yammesicka

Great job!

Please be sure to pass the flake8 and coverage CI jobs :)

app/config.py.example

app/telegram/handlers.py

app/telegram/pylander.py

tests/test_telegram.py

yammesicka · 2021-01-22T06:17:27Z

tests/test_telegram.py

+
+    page = profile_test_client.post(
+        '/telegram', data=gen_message('/start'))
+    assert page.status_code == 307


Prefer using the name of the status code

codecov-io · 2021-01-22T12:55:23Z

Codecov Report

Merging #111 (a5b4a6f) into develop (1ee995b) will increase coverage by 0.09%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop     #111      +/-   ##
===========================================
+ Coverage    99.46%   99.55%   +0.09%     
===========================================
  Files           21       26       +5     
  Lines          742      897     +155     
===========================================
+ Hits           738      893     +155     
  Misses           4        4

Impacted Files	Coverage Δ
app/database/models.py	`93.54% <100.00%> (+0.10%)`	⬆️
app/dependencies.py	`100.00% <100.00%> (ø)`
app/main.py	`100.00% <100.00%> (ø)`
app/routers/profile.py	`100.00% <100.00%> (ø)`
app/routers/telegram.py	`100.00% <100.00%> (ø)`
app/telegram/bot.py	`100.00% <100.00%> (ø)`
app/telegram/handlers.py	`100.00% <100.00%> (ø)`
app/telegram/keyboards.py	`100.00% <100.00%> (ø)`
app/telegram/models.py	`100.00% <100.00%> (ø)`
... and 4 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 1ee995b...a5b4a6f. Read the comment docs.

ivarshav · 2021-01-22T13:12:54Z

app/telegram/handlers.py

+To use PyLander Bot you have to register
+your Telegram Id in your profile page.
+
+Your Id is {chat.user_id}


Why a user needs to know his chat id?

As mentioned above, to use a bot you have to register an id in the profile page.

I probably missed your prev comment.
Would you please add here a link to it? thanks

ivarshav · 2021-01-22T13:14:21Z

tests/test_telegram.py

+        "https://google.com")
+
+    set_request = bot.set_webhook()
+    assert set_request.status_code == 404


Could use starlette.status for code status

ivarshav · 2021-01-22T13:15:46Z

tests/test_telegram.py

+    }
+
+
+def test_chat_model():


Consider surround tests with a class.
Also, you can add some consts (like "not found", "Unknown command") and use it in the tests.

ivarshav · 2021-01-22T13:17:04Z

tests/test_telegram.py

+
+    page = profile_test_client.post(
+        '/telegram', data=gen_message('/start'))
+    assert page.status_code == status.HTTP_307_TEMPORARY_REDIRECT


Nice! don't forget to use this class for all statuses :)

ivarshav · 2021-01-23T18:37:22Z

app/telegram/handlers.py

+        return answer
+
+
+async def reply_unknown_user(chat):


What do you mean by unknown user?

yammesicka · 2021-01-24T01:32:02Z

tests/test_profile.py

+    # Post new data
+    profile = profile_test_client.post(
+        '/profile/update_telegram_id', data=new_telegram_id)
+    assert profile.status_code == 302


Can you please change it to a fastapi.status const?

app/config.py.example

yammesicka

Great job! Added few more comments :)

yammesicka · 2021-01-24T13:15:32Z

app/main.py

@@ -5,7 +5,8 @@
 from app.database.database import engine
 from app.dependencies import (
    MEDIA_PATH, STATIC_PATH, templates)
-from app.routers import agenda, event, profile, email, invitation
+from app.telegram.pylander import pylander


Maybe as telegram_bot, to prevent future name collisions?

yammesicka · 2021-01-24T13:18:11Z

app/telegram/handlers.py

+        answer = f"{chosen_date.strftime('%B %d')}, \
+{chosen_date.strftime('%A')} Events:\n"
+
+        if not len(events):


Might be more Pythonic: if not events

yammesicka · 2021-01-24T13:19:47Z

app/telegram/keyboards.py

+
+def get_this_week_buttons() -> List[List[Any]]:
+    today = datetime.date.today()
+    day1 = today + datetime.timedelta(days=1)


for loop instead?

yammesicka · 2021-01-24T13:20:06Z

app/telegram/models.py

+        self.user_id = self._get_user_id(data)
+        self.first_name = self._get_first_name(data)
+
+    def _get_message_content(self, data):


Type annotation is missing. Also, what is data? message?

yammesicka · 2021-01-24T13:21:04Z

app/telegram/models.py

+        return requests.get(self.webhook_setter_url)
+
+    def drop_webhook(self):
+        data = {


Can be one line

yammesicka · 2021-01-24T13:21:35Z

app/telegram/models.py

+            'reply_markup': None}
+        if reply_markup:
+            message.update(reply_markup)
+        return requests.post(f'{self.base}sendMessage', data=message)


This should be async/background process. Currently it blocks the whole server

@hadaskedar2020

* update ORM and added export for an event * update ORM and added export for an event * Added in app shareable events * docs: add type annotation and fix folder structure * docs: add type annotation and fix folder structure * docs: fix documentation * feat: get weather forecast for date and location * feat: get weather forecast for date and location * add: tests * set up commit * add: timezone support * add: session management * fix bug * split conftest file * split conftest file * move "utils" folder into "internal" folder * working day view with jinja2 template * with tests for pytest * feat: get weather forecast - fixes according to requested changes. * change file structure * feat: get weather forecast - fixes according to requested changes. * first functioning day-view html, css and router * feat: Basic responsive calender day view page Added dayview template with css and router. An tempreroy event class with, processing function for the day view to work. * feat: Basic responsive calender day view page Added dayview template with css and router. An tempreroy event class with, processing function for the day view to work. fixed after taking notes. * fix lint now for sure * more lint * feat: get weather forecast - fix requirements.txt * feat: enable invited users to view events * feat: flake8 changes * fix: requirements bug * fix: requirements bug * feat: flake8 changes * add: tests * feat: flake8 changes * add: tests * feat: flake8 changes * edit: file structure * edit: file structure * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * feat: add route tests * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * fix: test bug * remove: config.py * after all notes and started use the orm * fix: type annotation * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * fixed: changed "size" var in html and and more acuurate typing * deleted some testing lines * add requirements missing * add: minor changes * feat: flake8 changes * @hadaskedar2020 * feat: get weather forecast - add API mocking * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * fixed: statements of event select more accurate * new test and lint fix * added more contants abd more notes taken * feat: weather forecast - move feat to internal * Delete Scripts directory * update constants * more notes * forgot white space * feat: gets a link to the suitable image of a given event content. (#70) * feat: gets a link to the suitable image of a given event content. * Add basic update event (#100) * Add basic update event * Added search feature (#98) * Added search feature * Add telegram client (#111) Add telegram client * feat: Add a feature for sharing information with a WhatsApp account (#83) * feat: Add a feature to share to a WhatsApp account * Feature/logging system (#112) * feat: first logging commit Co-authored-by: Liad Noam <[email protected]> * feat: add a daily inspirational quote (#128) * feat: add a daily inspirational quote * Feature/delete event (#139) * basic delete event * Add an event delete function * Fix flake8 * Deleting an unnecessary model * Extract lines from try * fix: modify psycopg2 dependency (#164) * Bugfix/logging system (#158) * Changed logging config to be received by separate parameters for simplicity, removed option to receive configuration as a dict, added .vscode to gitignore * removed logging_config file which is no longer needed * Fixing merge conflicts - missing whitespace on config.py.example Co-authored-by: Liad Noam <[email protected]> * Added checking for zoom link and saving the event (#122) * Added checking for zoom link and saving the event * Feature/import to calendar (#119) * feat: import file to calendar * docs: adding community standard documents (#173) * Feat: Event View Backend (#159) * Moved the route to top of file * Feature/send email (#88) * Added files for sending invitations by email This includes - templates - routes and internal code - configuration - tests Co-authored-by: leddest <[email protected]> Co-authored-by: Ellen <[email protected]> * Feature/translation - add an functionality to translate event data etc. (#167) * translation feature stuff * Update event - Improving the code (#138) * Add basic update event * Support categories for events (#137) * Support categories for events * Style/grid (#106) * Hello Wrold * Creating Html Template * Calendar dates calculation intigrating with html, HTML\CSS improvments. * Tests for calender_grid.py, changing function according to currections, fixing bugs * linting bug fixing * before merge with develop * Creating a Day object and days subclasses, changing all function and tests according to the new objects, Changing front to get information from Day objects, Re-arranging calendar.html grid stracture to be render by weeks, adding js functionality for day view section, adding css effects on daily event display * fix lintings * fix lintings * tests next week scroll * js updates * Calendar Scrolling with javascript * Fix lintings * Fix lintings * Calendar infinit scrolling ducplicates weeks bug fixed * seetings global parameters for calendar.py * Js - changing to fetch, removing jquery, fixing hint tpying, adding Week object, changing tests * Front end bug fixing * Fix linting * Fix lintings * Fix lintings * fixing syntax * Get user local date and time when enter calendar. * Fix lintings * Fix lintings * Fix lintings * Bugs fixing * Bugs fixing * Bugs fixing * Bugs fixing * JS alerts removal * Fix Lintings * Js syntext fixing * Bugs fixing * Bugs fixing * Js fixing varibales and adding div element to request. * Develop Update * Js - eliminate global parameters * Linting fixing * Fix Lintings * Fix flake8 * syntac fixing * Feature/translations workflow (#150) * feat: add translations workflow * fix(translations-workflow): fix doc * fix(translations-workflow): fixed code and added automatic commit Co-authored-by: Gonny <1@1> * Revert "Feature/translations workflow (#150)" (#208) This reverts commit 2e6a2c2. * feat: Add zodiac signs to the day & month view + refactor json data loader (#155) * feat: Add zodiac signs to the day/month view + * Change calendar link from '#' to '/' to get the home page (#194) when clicking on the logo * Style/grid (#200) * Js scrolling duplication days fixed Co-authored-by: Idan Pelled <[email protected]> Co-authored-by: Hadas Kedar <[email protected]> Co-authored-by: Sagi Zaid Or <[email protected]> Co-authored-by: sagizaidor <[email protected]> Co-authored-by: hadaskedar2020 <[email protected]> Co-authored-by: nir9696 <[email protected]> Co-authored-by: efratush <[email protected]> Co-authored-by: advaa123 <[email protected]> Co-authored-by: leddest <[email protected]> Co-authored-by: nelliei <[email protected]> Co-authored-by: Liad-n <[email protected]> Co-authored-by: Liad Noam <[email protected]> Co-authored-by: zohary89 <[email protected]> Co-authored-by: Ron Huberfeld <[email protected]> Co-authored-by: Ap1234567 <[email protected]> Co-authored-by: Nir-P <[email protected]> Co-authored-by: Ode <[email protected]> Co-authored-by: Anna Shtirberg <[email protected]> Co-authored-by: Ellen <[email protected]> Co-authored-by: ivarshav <[email protected]> Co-authored-by: Aviad <[email protected]> Co-authored-by: Gonzom <[email protected]> Co-authored-by: Gonny <1@1> Co-authored-by: YairEn <[email protected]>

leddcode added 6 commits January 20, 2021 19:00

Minor changes

12cc75c

Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

f5f29c0

…into telegram

Add telegram client

a7793c3

Apply merge changes

bfe2ceb

Minor fixes

7af4147

Minor fixes

8433c4a

yammesicka requested changes Jan 22, 2021

View reviewed changes

leddcode added 2 commits January 22, 2021 14:26

Create FastAPI Settings object

091db8e

Use status code names in telegram tests

8e93a36

ivarshav reviewed Jan 22, 2021

View reviewed changes

leddcode added 2 commits January 22, 2021 15:30

Use status code names in telegram tests

b8d0cba

Add Asynchronous Testing and Increase Code Coverage.

198e4d6

ivarshav reviewed Jan 23, 2021

View reviewed changes

app/telegram/handlers.py

return answer

async def reply_unknown_user(chat):

Copy link

Contributor

ivarshav Jan 23, 2021

Choose a reason for hiding this comment

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

What do you mean by unknown user?

Added keyboards, handlers and tests. Updated telegram models.

3fc9d49

yammesicka reviewed Jan 24, 2021

View reviewed changes

leddcode added 4 commits January 24, 2021 04:26

Update tests.

798a72f

Minor fixes.

3078682

Add test bot client with registered user

94a8c01

Minor fix

b0bc592

yammesicka requested changes Jan 24, 2021

View reviewed changes

Make telegram bot working async. Add async fixture and tests.

de2995c

leddcode requested a review from yammesicka January 24, 2021 19:46

Resolve conflict on merge

e618089

leddcode force-pushed the telegram branch from 9acb9dc to e618089 Compare January 25, 2021 19:06

leddcode added 2 commits January 26, 2021 00:51

Add telegram tests

2122222

Make request.post works asynchronous

c1d309a

Merge updates

8795a7b

yammesicka approved these changes Jan 27, 2021

View reviewed changes

Minor change

a5b4a6f

yammesicka merged commit bcf470b into PythonFreeCourse:develop Jan 27, 2021

Add telegram client #111

Add telegram client #111

Uh oh!

Conversation

leddcode commented Jan 21, 2021

Uh oh!

yammesicka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-io commented Jan 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ivarshav Jan 22, 2021 • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yammesicka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov-io commented Jan 22, 2021 •

edited

Loading

ivarshav Jan 22, 2021 •

edited

Loading