-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add untracked files after merge * [Fix] Pull Updated changes to develop * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Fix #157385654]Remove _pycache_ files * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add latest changes from develop * [fix #157385654]Fix flake8 issues * [Fix #157385654] Fix failing test. * [Feature #157385654]Add tests for events * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add latest changes from develop * [Fix #157385654] Fix failing test. * [Feature #157385654]Add tests for events * [Fix #157385654]Run migrations with calendar_id field * [Fix #157385654]Pull remote changes * [Fix #157385654]Fix failing test fixtures * [Fix #157385654]Fix flake8 errors * [Fix #157385654]Fix migration issues * [Fix #157385654] Add descriptive error This commit enables raising of a more descriptive error when a calandarId given on the query is not assigned to any calendar on ocnverge * [Fix]Add google api credentials to .env example * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654]Add latest changes from develop * [Fix #157385654] Fix failing test. * [Feature #157385654]Add tests for events * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add tests Add tests for the RoomSchedule query that contains google calendar intergration * [Feature #157385654] Add getRoomSchedule query * [Feature #157385654]Add view room schedule functionality This commit enables a user to view room schedule from the google calendar api. One is able to specify the calendar_id and the number of days they need and will then receive information containing the event start time and summary of the event * [Feature #157385654]Add latest changes from develop * [Fix #157385654] Fix failing test. * [Feature #157385654]Add tests for events * [Fix #157385654]Run migrations with calendar_id field * [Fix #157385654]Pull remote changes * [Fix #157385654]Fix failing test fixtures * [Fix #157385654]Fix flake8 errors * [Fix #157385654]Fix migration issues * [Fix #157385654] Add descriptive error This commit enables raising of a more descriptive error when a calandarId given on the query is not assigned to any calendar on ocnverge * [Fix]Add google api credentials to .env example * [fix] Add new changes from develop * [fix] Add new changes from develop * [Fix]Fix failing test
- Loading branch information
Showing
22 changed files
with
467 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
"""empty message | ||
Revision ID: 06c4fd428167 | ||
Revises: | ||
Create Date: 2018-06-05 12:29:10.404447 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
|
||
# revision identifiers, used by Alembic. | ||
revision = '06c4fd428167' | ||
down_revision = None | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('devices') | ||
op.add_column('rooms', sa.Column('calendar_id', sa.String(), nullable=True)) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_column('rooms', 'calendar_id') | ||
op.create_table('devices', | ||
sa.Column('id', sa.INTEGER(), nullable=False), | ||
sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('device_type', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('date_added', sa.VARCHAR(), autoincrement=False, nullable=True), | ||
sa.Column('last_seen', sa.VARCHAR(), autoincrement=False, nullable=True), | ||
sa.Column('location', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('resource_id', sa.INTEGER(), autoincrement=False, nullable=True), | ||
sa.ForeignKeyConstraint(['resource_id'], ['resources.id'], name='devices_resource_id_fkey'), | ||
sa.PrimaryKeyConstraint('id', name='devices_pkey') | ||
) | ||
# ### end Alembic commands ### |
40 changes: 40 additions & 0 deletions
40
alembic/versions/16706f39418e_add_calndarid_field_to_room_table.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
"""Add calndarId field to room table | ||
Revision ID: 16706f39418e | ||
Revises: c231314bba8d | ||
Create Date: 2018-06-07 15:51:04.456452 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
|
||
# revision identifiers, used by Alembic. | ||
revision = '16706f39418e' | ||
down_revision = 'c231314bba8d' | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('devices') | ||
op.add_column('rooms', sa.Column('calendar_id', sa.String(), nullable=True)) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_column('rooms', 'calendar_id') | ||
op.create_table('devices', | ||
sa.Column('id', sa.INTEGER(), nullable=False), | ||
sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('device_type', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('date_added', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('last_seen', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('location', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('resource_id', sa.INTEGER(), autoincrement=False, nullable=True), | ||
sa.ForeignKeyConstraint(['resource_id'], ['resources.id'], name='devices_resource_id_fkey'), | ||
sa.PrimaryKeyConstraint('id', name='devices_pkey') | ||
) | ||
# ### end Alembic commands ### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
"""Add calendarId | ||
Revision ID: 21ca82d232ff | ||
Revises: b3be355ffe21 | ||
Create Date: 2018-06-13 13:08:35.409236 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
from sqlalchemy.dialects import postgresql | ||
|
||
# revision identifiers, used by Alembic. | ||
revision = '21ca82d232ff' | ||
down_revision = 'b3be355ffe21' | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('devices') | ||
op.add_column('rooms', sa.Column('calendar_id', sa.String(), nullable=False)) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_column('rooms', 'calendar_id') | ||
op.create_table('devices', | ||
sa.Column('id', sa.INTEGER(), nullable=False), | ||
sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('device_type', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('date_added', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), | ||
sa.Column('last_seen', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), | ||
sa.Column('location', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('resource_id', sa.INTEGER(), autoincrement=False, nullable=True), | ||
sa.ForeignKeyConstraint(['resource_id'], ['resources.id'], name='devices_resource_id_fkey'), | ||
sa.PrimaryKeyConstraint('id', name='devices_pkey') | ||
) | ||
# ### end Alembic commands ### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
"""empty message | ||
Revision ID: 631fe5fea815 | ||
Revises: b3be355ffe21, 06c4fd428167 | ||
Create Date: 2018-06-07 14:07:21.597872 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
|
||
# revision identifiers, used by Alembic. | ||
revision = '631fe5fea815' | ||
down_revision = ('b3be355ffe21', '06c4fd428167') | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
pass | ||
|
||
|
||
def downgrade(): | ||
pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
"""empty message | ||
Revision ID: a3a250e2805a | ||
Revises: 16706f39418e | ||
Create Date: 2018-06-08 15:32:37.991700 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
from sqlalchemy.dialects import postgresql | ||
|
||
# revision identifiers, used by Alembic. | ||
revision = 'a3a250e2805a' | ||
down_revision = '16706f39418e' | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('devices') | ||
op.add_column('rooms', sa.Column('calendar_id', sa.String(), nullable=True)) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_column('rooms', 'calendar_id') | ||
op.create_table('devices', | ||
sa.Column('id', sa.INTEGER(), nullable=False), | ||
sa.Column('name', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('device_type', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('date_added', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), | ||
sa.Column('last_seen', postgresql.TIMESTAMP(), autoincrement=False, nullable=False), | ||
sa.Column('location', sa.VARCHAR(), autoincrement=False, nullable=False), | ||
sa.Column('resource_id', sa.INTEGER(), autoincrement=False, nullable=True), | ||
sa.ForeignKeyConstraint(['resource_id'], ['resources.id'], name='devices_resource_id_fkey'), | ||
sa.PrimaryKeyConstraint('id', name='devices_pkey') | ||
) | ||
# ### end Alembic commands ### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"access_token": "ya29.Gl3ZBUb8ewx_F9NdEtMIDxH1XPsKOJA64dJwSqd7I6SuDbynB-UHCDw58VtcbjgYZPFrEKrk_99kvJolLRGGuXAUXBRLzAZ85ZaRUkPen-ehtjsycrPbMefC6wV7rMo", "client_id": "753057157806-4n8rnuuvn9iagp7md6s6448omdqi0iif.apps.googleusercontent.com", "client_secret": "DV154Q4dUxR-gaGtiBmonItI", "refresh_token": "1/scqhTOtBcRLGoC5a5brOZElp6a__tUbdbe17p8R7o9g", "token_expiry": "2018-06-13T12:59:51Z", "token_uri": "https://www.googleapis.com/oauth2/v4/token", "user_agent": null, "revoke_uri": "https://accounts.google.com/o/oauth2/revoke", "id_token": null, "id_token_jwt": null, "token_response": {"access_token": "ya29.Gl3ZBUb8ewx_F9NdEtMIDxH1XPsKOJA64dJwSqd7I6SuDbynB-UHCDw58VtcbjgYZPFrEKrk_99kvJolLRGGuXAUXBRLzAZ85ZaRUkPen-ehtjsycrPbMefC6wV7rMo", "token_type": "Bearer", "expires_in": 3600}, "scopes": ["https://www.googleapis.com/auth/calendar.readonly"], "token_info_uri": "https://www.googleapis.com/oauth2/v3/tokeninfo", "invalid": false, "_class": "OAuth2Credentials", "_module": "oauth2client.client"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Oops, something went wrong.