Feature/import to calendar #119

Nir-P · 2021-01-22T23:08:36Z

This feature includes functions that support importing txt, csv, and ics (iCalendar) files to our Calendar.

txt and csv files must be in the following structure:

Title1, Content1, S_Date1, E_Date1
Title2, Content2, S_Date2, E_Date2
...
TitleN, ContentN, S_DateN, E_DateN

the main function "user_click_import" handles the file, checking that the file passes all the rules we set, and if everything is ok the file imported to the calendar and populates the event table.

some of the rules we set (can be changed through a global variable):

Files must be txt, csv, or ics.
Maximum file size 5 MB.
txt and csv must be in the structure explained above.
Date must be with the following mask "MM-DD-YYYY" (for txt and csv).
The title of the event can't be empty.
The title length is up to 50 characters.
The content may be empty.
The content length is up to 500 characters.
Maximum events with the same date: 10.
Events must be within 20 years range before and after the current year.

UPDATE:

Added support for the start date and end date in the event table.

Lisafiluz · 2021-01-23T09:10:40Z

app/internal/import_file.py

+        if file.lower().endswith(VALID_FILE_EXTENSION[-1]):
+            import_file = import_ics_file(file)
+        else:
+            import_file = import_txt_file(file)


This is the function for txt and csv files?

yes, import_txt_file(file) handles txt and csv files

app/internal/import_file.py

Gonzom · 2021-01-23T10:42:25Z

app/database/models.py

-    start = Column(DateTime, nullable=False)
-    end = Column(DateTime, nullable=False)
+    date = Column(DateTime, nullable=False)


There are very valid reasons to set an end date for an event. Please change this back.

Hi Gonzom, thank you for your review, I appreciate it.
when I started this ticket we didn't have a start date and end date.
I'm working now to integrate it into my code.

app/internal/import_file.py

tests/test_import_file.py

…ility

yammesicka

Awesome job! Added few of my insights, please take a look.

app/internal/import_file.py

tests/conftest.py

tests/test_import_file.py

codecov-io · 2021-01-25T20:48:41Z

Codecov Report

Merging #119 (7afb542) into develop (b22fbdb) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop     #119      +/-   ##
===========================================
+ Coverage    99.49%   99.54%   +0.04%     
===========================================
  Files           30       31       +1     
  Lines          989     1088      +99     
===========================================
+ Hits           984     1083      +99     
  Misses           5        5

Impacted Files	Coverage Δ
app/internal/import_file.py	`100.00% <100.00%> (ø)`
app/main.py	`97.05% <0.00%> (-0.31%)`	⬇️
app/dependencies.py	`100.00% <0.00%> (ø)`

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 b22fbdb...7afb542. Read the comment docs.

app/internal/import_file.py

tests/test_import_file.py

app/internal/import_file.py

tests/test_import_file.py

app/internal/import_file.py

app/config.py.example

yammesicka

Awesome progress! Added few little things :)

yammesicka · 2021-01-31T03:46:21Z

app/internal/import_file.py

+        return []
+    for component in calendar_read.walk():
+        if component.name == DESC_EVENT:
+            if is_valid_data_event_ics(component):


Flip the condition to return early

the first if checks if the event is "VEVENT". other events like "VTODO" and "VJOURNAL" not interest us and we skip them.
the nested if checks if the "VEVENT" fields are valid. so I'm thinking to keep it in this order if it is ok.

My intention was to rewrite the code like that:

if not is_valid_data_event_ics(component): return [] save_calendar_content_ics(component, calendar_content)

Is there any logical difference that I miss here?

I thought you want to change the if's order my bad :)
I changed it.
In addition, after you accept this ticket could I open a new one after I characterize all the new changes required and tests?
(I want to add location support and more start and end date tests for our code)

Yeah sure why not :)

app/internal/import_file.py

yammesicka · 2021-01-31T22:05:25Z

app/internal/import_file.py

+        return []
+    for component in calendar_read.walk():
+        if component.name == DESC_EVENT:
+            if is_valid_data_event_ics(component):


My intention was to rewrite the code like that:

if not is_valid_data_event_ics(component): return [] save_calendar_content_ics(component, calendar_content)

Is there any logical difference that I miss here?

@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]>

Nir-P added 4 commits January 22, 2021 21:22

feat: import file to calendar

eff5b49

feat: import file to calendar

521625b

fix: import ics fix invalid date

7d8816b

fix: import ics fix invalid date

87f3ded

Nir-P changed the base branch from main to develop January 22, 2021 23:10

fix: line to long E501

6758901

Lisafiluz reviewed Jan 23, 2021

View reviewed changes

Gonzom reviewed Jan 23, 2021

View reviewed changes

tests/test_import_file.py Outdated Show resolved Hide resolved

tests/test_import_file.py Outdated Show resolved Hide resolved

Nir-P added 3 commits January 23, 2021 23:13

fix: change functions to support start and end dates plus code readab…

ed5704d

…ility

fix: support start and end dates

3bd5f6f

fix: remove unnecessary test files

387c4a4

yammesicka requested changes Jan 24, 2021

View reviewed changes

added files from develop

fd9d0b4

ivarshav reviewed Jan 25, 2021

View reviewed changes

app/internal/import_file.py Outdated Show resolved Hide resolved

ivarshav reviewed Jan 25, 2021

View reviewed changes

tests/conftest.py Outdated Show resolved Hide resolved

ivarshav reviewed Jan 25, 2021

View reviewed changes

tests/test_import_file.py Show resolved Hide resolved

Nir-P added 4 commits January 25, 2021 21:38

fix: added globals to confix and some minor changes

8f0fa28

added from develop and fix requirements

36d3765

fix: conftest

b1c7a99

fix: up coverage tests to 100%

7939c5e

fix: up coverage tests to 100% and removed dup fixture

12719b9

IdanPelled suggested changes Jan 26, 2021

View reviewed changes

app/internal/import_file.py Outdated Show resolved Hide resolved

IdanPelled reviewed Jan 26, 2021

View reviewed changes

app/internal/import_file.py Outdated Show resolved Hide resolved

IdanPelled reviewed Jan 26, 2021

View reviewed changes

tests/test_import_file.py Show resolved Hide resolved

yammesicka requested changes Jan 27, 2021

View reviewed changes

Nir-P added 3 commits January 27, 2021 22:51

fix: some minor fixes and more readibility

5142ab5

fix: some minor fixes and more readibility

826417f

fix: requirements fix

1b045bd

fix: small readibility fix

cb35056

Nir-P requested a review from yammesicka January 27, 2021 21:36

yammesicka requested changes Jan 27, 2021

View reviewed changes

app/internal/import_file.py Outdated Show resolved Hide resolved

app/internal/import_file.py Outdated Show resolved Hide resolved

fix: small readibility

fcf0ad6

Gonzom reviewed Jan 27, 2021

View reviewed changes

app/config.py.example Outdated Show resolved Hide resolved

Nir-P added 2 commits January 28, 2021 22:39

fix: small changes

a90f824

fix: requirements

9bc8b51

Nir-P requested a review from yammesicka January 28, 2021 20:47

Nir-P added 3 commits January 31, 2021 00:46

fix: using [] literals

208ef69

fix: requirements

71b8ff5

fix: using [] literals

8775ae3

yammesicka requested changes Jan 31, 2021

View reviewed changes

fix: small changes

3de6b39

Nir-P requested a review from yammesicka January 31, 2021 20:49

fix: small changes

7afb542

yammesicka requested changes Jan 31, 2021

View reviewed changes

fix: small changes

3923d2d

Nir-P requested a review from yammesicka January 31, 2021 22:28

yammesicka merged commit 38d6088 into PythonFreeCourse:develop Feb 1, 2021

Nir-P mentioned this pull request Feb 4, 2021

feat: improve import file to calendar and extend capabilities #201

Merged

Nir-P mentioned this pull request Feb 10, 2021

Import events from file to calendar #28

Open

Feature/import to calendar #119

Feature/import to calendar #119

Uh oh!

Conversation

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

Uh oh!

This feature includes functions that support importing txt, csv, and ics (iCalendar) files to our Calendar.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yammesicka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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!

Nir-P Jan 31, 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!

Nir-P commented Jan 22, 2021 •

edited

Loading

codecov-io commented Jan 25, 2021 •

edited

Loading

Nir-P Jan 31, 2021 •

edited

Loading