Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backend team - Sprint 2 #135

Merged
merged 92 commits into from
Mar 15, 2020
Merged

Backend team - Sprint 2 #135

merged 92 commits into from
Mar 15, 2020

Commits on Mar 6, 2020

  1. create new database model

    @Ziheng-Wang @alldne
    Ziheng-Wang authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    5a7c79f View commit details
    Browse the repository at this point in the history

  2. create new database model

    @Ziheng-Wang @alldne
    Ziheng-Wang authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    4a70332 View commit details
    Browse the repository at this point in the history

  3. creating new database models

    @Ziheng-Wang @alldne
    Ziheng-Wang authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    067cc33 View commit details
    Browse the repository at this point in the history

  4. creating a new database model

    @Ziheng-Wang @alldne
    Ziheng-Wang authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    73846e5 View commit details
    Browse the repository at this point in the history

  5. new schema

    @Ricardo-1894 @alldne
    Ricardo-1894 authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    17d712f View commit details
    Browse the repository at this point in the history

  6. fix travis

    @Ricardo-1894 @alldne
    Ricardo-1894 authored and alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    c1ba900 View commit details
    Browse the repository at this point in the history

  7. Add black/flake8 configuration

    @alldne
    alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    ddded28 View commit details
    Browse the repository at this point in the history

  8. Fix flake8 issues

    @alldne
    alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    735cfb5 View commit details
    Browse the repository at this point in the history

  9. Resolve conflicts on migrations

    @alldne
    alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    92fe31e View commit details
    Browse the repository at this point in the history

  10. Remove settings that force locally running app to use postgres

    @alldne
    alldne committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    b3629a7 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #46 from gcivil-nyu-org/backend/develop 

    Backend Sprint 1
    @VentusXu09
    VentusXu09 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    e2980ab View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2020

  1. Update code formatting rules

    @jackxujh
    jackxujh committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    0fb356d View commit details
    Browse the repository at this point in the history

  2. Remove an obsolete configuration file

    @jackxujh
    jackxujh committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    1eda86f View commit details
    Browse the repository at this point in the history

  3. Format existing code

    @jackxujh
    jackxujh committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    018893a View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2020

  1. Merge pull request #52 from gcivil-nyu-org/backend/feature/code-forma… 

    …tting

Update code formatting rules
    @daisycrego
    daisycrego committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    6e6b461 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into backend/master

    @daisycrego
    daisycrego committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    52a4600 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from gcivil-nyu-org/backend/develop 

    Merge Backend/develop into Backend/master
    @Ricardo-1894
    Ricardo-1894 committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    74fb9cd View commit details
    Browse the repository at this point in the history

  4. Add new data model in a new app

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    7f1adae View commit details
    Browse the repository at this point in the history

  5. Add serializers for the new data model

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    775d549 View commit details
    Browse the repository at this point in the history

  6. Add test for serializing AGEvent table

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    56f5ab3 View commit details
    Browse the repository at this point in the history

  7. Add dependencies for data model serializer tests

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    8172a28 View commit details
    Browse the repository at this point in the history

  8. Add a simulator to directly write measurements

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    6bdcffd View commit details
    Browse the repository at this point in the history

  9. Format code

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    28d29f9 View commit details
    Browse the repository at this point in the history

  10. Cross check to verify fields in measurements

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    688b1ef View commit details
    Browse the repository at this point in the history

  11. Format code: simulator.py

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    728a8eb View commit details
    Browse the repository at this point in the history

  12. Add simulator tests for all sensor presets

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    6e30d9a View commit details
    Browse the repository at this point in the history

  13. Add simulator tests for batch measurement logging

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    97e1e32 View commit details
    Browse the repository at this point in the history

  14. Set up simulator instance in setUp() for testing

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    09d804a View commit details
    Browse the repository at this point in the history

  15. Add more tests for simulator's methods

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    1f8e0a8 View commit details
    Browse the repository at this point in the history

  16. Improve live mersurement simulation

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    b0dde0a View commit details
    Browse the repository at this point in the history

  17. Merge pull request #57 from gcivil-nyu-org/backend/master 

    Merge backend/master to backend-team
    @daisycrego
    daisycrego committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    c5d4e00 View commit details
    Browse the repository at this point in the history

  18. Add example data dump in ag_data app 

    This data dump is generated with:

    python manage.py dumpdata ag_data --indent 4 > ag_data/examples/data_dump.json
    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    307153c View commit details
    Browse the repository at this point in the history

  19. Add additional data in example dump of ag_data

    @jackxujh
    jackxujh committed Mar 8, 2020
    Configuration menu
    Copy the full SHA
    382a98d View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Merge pull request #55 from gcivil-nyu-org/backend/feature/data-model 

    Create a new data model with tests
    @daisycrego
    daisycrego committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    90da0e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'backend-team' into backend/develop

    @jackxujh
    jackxujh committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    83756cc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #59 from gcivil-nyu-org/backend/develop 

    Merge backend/develop into backend-team
    @Ricardo-1894
    Ricardo-1894 committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    bbc63ac View commit details
    Browse the repository at this point in the history

  4. Merge branch 'backend-team' into sync-backend

    @alldne
    alldne committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    666a99f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #70 from gcivil-nyu-org/sync-backend 

    Sync backend
    @jackxujh
    jackxujh committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    c4d72e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. Add table for event venues

    @jackxujh
    jackxujh committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    9d4dc99 View commit details
    Browse the repository at this point in the history

  2. Format code

    @jackxujh
    jackxujh committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    50ac76f View commit details
    Browse the repository at this point in the history

  3. Fix broken tests and format code

    @jackxujh
    jackxujh committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    6f605c2 View commit details
    Browse the repository at this point in the history

  4. Fix a broken test

    @jackxujh
    jackxujh committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    4a449df View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Introduce table: Sensor Type

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    2ce0c36 View commit details
    Browse the repository at this point in the history

  2. Beautify code

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    26e3be6 View commit details
    Browse the repository at this point in the history

  3. Migrate presets in common.py to presets.py

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3b2defa View commit details
    Browse the repository at this point in the history

  4. Format code

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    7c1dddf View commit details
    Browse the repository at this point in the history

  5. Update sensor type creation and reset method 

    The renamed ag_data.simulator.Simulator.createOrResetASensorTypeFromPresets(self, index) will replace createASensorTypeFromPresets(self, index). It will check if the sensor type is in the database, and try to update it with presets if it does. Tests are modified accordingly.
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    919998c View commit details
    Browse the repository at this point in the history

  6. Format code

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    dd0fdf6 View commit details
    Browse the repository at this point in the history

  7. Update database dump file: data_dump.json

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    2578c93 View commit details
    Browse the repository at this point in the history

  8. Move data model serialization to its own branch 

    The serializers will be maintained in a new dedicated branch. This helps eliminate the impact of serialization features on the data model itself. The serialization will be most likely to incorporated with future branches regarding to the API.
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    7009b29 View commit details
    Browse the repository at this point in the history

  9. Fix tests for simulator and data model

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    ae975d2 View commit details
    Browse the repository at this point in the history

  10. Fix assertion in a Simulator test

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3866957 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #74 from gcivil-nyu-org/backend/feature/data-model 

    Update data model
    @Ricardo-1894
    Ricardo-1894 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    8cb4ebc View commit details
    Browse the repository at this point in the history

  12. Change latitude/longitude to DecimalField in db

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3aad582 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'origin/backend/develop' into backend/fe… 

    …ature/data-model
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    a690d37 View commit details
    Browse the repository at this point in the history

  14. Fix decimal fields

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    165b193 View commit details
    Browse the repository at this point in the history

  15. Refactor data model and rename fields

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3e54c33 View commit details
    Browse the repository at this point in the history

  16. Rename fields in data model 

    The new naming scheme will not prefix table field names with the table name. And also makes sure the naming is more consistent, readable and shorter.
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    d9c2174 View commit details
    Browse the repository at this point in the history

  17. Format code

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    11f7529 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #77 from gcivil-nyu-org/backend/feature/data-model 

    Refactor data model
    @daisycrego
    daisycrego committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    8bcbf76 View commit details
    Browse the repository at this point in the history

  19. Update models.py 

    Complete the comment for all tables.
    @Ziheng-Wang
    Ziheng-Wang committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    bb1ac51 View commit details
    Browse the repository at this point in the history

  20. Update simulator.py

    @Ziheng-Wang
    Ziheng-Wang committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    599f07d View commit details
    Browse the repository at this point in the history

  21. Update simulator.py

    @Ziheng-Wang
    Ziheng-Wang committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    693125a View commit details
    Browse the repository at this point in the history

  22. Update data model comments

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    830b8a3 View commit details
    Browse the repository at this point in the history

  23. Format code

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    ed97d21 View commit details
    Browse the repository at this point in the history

  24. Rename measurement_event to event_uuid in AGMeasurement

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    6b73362 View commit details
    Browse the repository at this point in the history

  25. Update models.py

    @Ziheng-Wang
    Ziheng-Wang committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    d3b0399 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'backend/develop' into backend/feature/data-model

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    c5d2e65 View commit details
    Browse the repository at this point in the history

  27. Add missing quotation marks for comments

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    ee815f7 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #83 from gcivil-nyu-org/backend/feature/data-model 

    Update data model comments and format code
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    bb03a1b View commit details
    Browse the repository at this point in the history

  29. Merge pull request #78 from gcivil-nyu-org/backend/develop 

    Sprint 3: LGTM
    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    4229b4b View commit details
    Browse the repository at this point in the history

  30. remove unused hardware py file

    @VentusXu09
    VentusXu09 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    6e7ed24 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #90 from gcivil-nyu-org/backend/feature/remove_unu… 

    …sed_hardware

remove unused hardware py file
    @alldne
    alldne committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    5ca8561 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'backend-team' into backend/develop

    @alldne
    alldne committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    2a4ebb2 View commit details
    Browse the repository at this point in the history

  33. Merge pull request #93 from gcivil-nyu-org/backend/develop 

    Remove unused file
    @VentusXu09
    VentusXu09 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    98e1b3f View commit details
    Browse the repository at this point in the history

  34. Correct preset names

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    68a7ac5 View commit details
    Browse the repository at this point in the history

  35. Improve presets

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    e1d200b View commit details
    Browse the repository at this point in the history

  36. Fix simulator

    @jackxujh
    jackxujh committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    64f5b33 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Merge branch 'backend/feature/data-model' into backend/feature-data-m… 

    …odel-aux
    @jackxujh
    jackxujh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f6eea7f View commit details
    Browse the repository at this point in the history

  2. Add a test for multiple simulator instances 

    This test is added to examine the issue happened right before sprint 2 demo
    @jackxujh
    jackxujh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    08cac57 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #126 from gcivil-nyu-org/backend/feature/data-model 

    Fix data model issues found in sprint demo
    @Ziheng-Wang
    Ziheng-Wang committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ac7ca59 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'backend-team' into backend/develop

    @jackxujh
    jackxujh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a664a0e View commit details
    Browse the repository at this point in the history

  5. Resolved conflicts by adding new features from backend/develop to master

    Vibhor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    aba80dc View commit details
    Browse the repository at this point in the history

  6. Resolved conflicts

    Vibhor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    c95e7c2 View commit details
    Browse the repository at this point in the history

  7. Added migrations

    @iamvibhorsingh
    iamvibhorsingh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    5c3a1af View commit details
    Browse the repository at this point in the history

  8. Removed trailing whitespaces

    @iamvibhorsingh
    iamvibhorsingh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fe2eea5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #130 from gcivil-nyu-org/backend-sprint-2 

    Backend - sprint 2
    @jackxujh
    jackxujh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7137d7a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #131 from gcivil-nyu-org/backend/develop 

    Merge develop to backend master
    @jackxujh
    jackxujh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    b1912f8 View commit details
    Browse the repository at this point in the history

  11. Resolved travis conflicts

    Vibhor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    b71de85 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #133 from gcivil-nyu-org/backend-sprint2 

    Backend sprint2
    @alldne
    alldne committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a276544 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'backend-team' into backend/develop

    @iamvibhorsingh
    iamvibhorsingh committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    5e240ae View commit details
    Browse the repository at this point in the history

  14. Merge pull request #134 from gcivil-nyu-org/backend/develop 

    Backend team - Sprint 2 updated
    @Ricardo-1894
    Ricardo-1894 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fcd6156 View commit details
    Browse the repository at this point in the history