Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Event registration (feature-main-branch) (EXPOSURE-5062) #2456

Merged
merged 24 commits into from
Mar 12, 2021

Conversation

d4rken
Copy link
Member

@d4rken d4rken commented Feb 24, 2021

WIP

mtwalli and others added 3 commits February 26, 2021 10:31
* Add Base32 wrapper and unit tests for it

* Extend base test

* Convert into extensions

* Added a new variant for ByteString

* Include decoding for ByteString only

* Add unit testing for ByteString Encoding to String
* Skeleton classes for event registration.

* Add trailing commas

Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
@d4rken d4rken changed the base branch from release/1.15.x to release/1.16.x March 1, 2021 16:55
mtwalli and others added 5 commits March 4, 2021 16:35
* Setup deep-linking to confirmation

* Update ConfirmCheckInFragment.kt

* Update fragment_confrim_check_in.xml

* Create Uri.kt

* Add navUri extension

* Handle deep-linking in MainActivity

* Check event decoding

* Add scan check-in qr code fragment

* Create viewModel and DI modules

* lint

* Create ViewModel

* Delegate work to view model

* use viewmodel

* Add unit test for navUri

* Adjust data

* Add unit tests for deep-linking

* lint

* Remove + from id references

* Add TODO

* Add unit tests

* Add tests

* add ToDo

* Fix test

* Deep linking for Event Registration (EXPOSUREAPP-5305) (#2502)

* Handle deep-linking and shortcuts

* lint

* Fillin intent in Onboarding

* Lint

* Delete ConfirmCheckInFragment.kt

* Fix test
* Generate QR-Code PDF

* lint

* Update QrCodeGenerationTestFragmentViewModel.kt

* Share internal file

* Move qr code under event registration

* Reduce size

* Refactoring

* Remove padding

* Fix unresolved reference

* Lint

* Increase qr-code quality

* Merge two actions in Event main screen

* klint

* Adjust sizes
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
@d4rken d4rken changed the base branch from release/1.16.x to release/2.0.x March 9, 2021 16:14
chris-cwa and others added 4 commits March 9, 2021 17:32
* repo for checkins

* repo for checkins

* renamed param

* added more crud methods

* added fields from new specs version

* fixed ktlint issue

* fixed class hierarchy

* fixed UnnecessaryAbstractClass

* fixed nullable types

* renamed to Event* to TraceLocation* to be in sync with spec

* moved database one package level up

* use app scope for insert

* renamed const

* convert data between repo and database

* removed interface for data class, renaming, housekeeping

* entity is no parcel anymore

* + update method in checkin repo
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
#2551

* Change censoring such that on tester builds it's noticeable whether it worked or not.

* Add debug log censors for new diary data fields: Loaction/Person: Email&Phone; Visit/Encounter: Circumstances.

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
* added new confirmation alert

* linting
d4rken and others added 5 commits March 10, 2021 13:23
# Conflicts:
#	Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/files/FileSharing.kt
#	Corona-Warn-App/src/main/res/navigation/nav_graph.xml
* Basic setup

* Test verification

* Update DefaultQRCodeVerifierTest.kt

* Invert boolean to reflect method name

* Adjustments to prepare for refactoring of "Verificationkeys" class.

* Add more tests and modify encoded event data

* Update ConfirmCheckInViewModelTest.kt

* Consider warning case

* Add test cases for warning

* Fix test

* Show error

* Add todo

* lint

* Move time warnings into result

* Update ConfirmCheckInViewModelTest.kt

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
* Refactoring

- Add basic setup for attendee and organizer
- Renaming and re-packing for already implemented screens

* Rename

* Add check in tab

* lint

* Connect scan fragment

* Navigate to confirm event

* Fix import

* lint

* Add FAB text

* Update MDC version

* Catch error

* Animate transition

* Add space

* Connect check-in flow

* Parse signed event

* Import SingleLiveData

* Add test

* Clean-up

* Delete ConfirmCheckInViewModel.kt

* Support new deeplink host and requirements

* Validate uri

* Update LauncherActivityTest.kt

* Renaming

* Trace location times are in seconds

* Delete redundants

* Remove destinations from main graph

those destinations are part of attendee graph now

* Use hard coded string

* Verify uri

* Pass QRCodeVerifyResult directly

* lint
@d4rken d4rken marked this pull request as ready for review March 11, 2021 10:52
@d4rken d4rken requested review from a team March 11, 2021 10:52
harambasicluka and others added 6 commits March 11, 2021 17:57
* Create PrintingAdapter.kt

* Update PrintingAdapter.kt

* Test printing

* Update QrCodeCreationTestViewModel.kt

* Remove Charset causing crash only older versions

* Log

* Add logs and specify media size
…REAPP-5484) (#2549)

* Add events card in event registration test fragment

* Format

* Create empty fragments and implement navigation

* Create layout for CreateEventTestFragment.kt

* Add spinner for event type

* Build event object from input

* Create database for event registration and store events in it

* Fix date issue

* Show stored events in a simple way

* Make event list more pretty

* Add button to delete all events in ShowStoredEventsTestFragment.kt

* Change the functions of HostedEventRepository.kt to regular functions instead of suspend functions

* Change text in EventRegistration TestFragment

* Fix merge issues

* Add parameters from new TechSpec

* Change wording from 'hosted Events' to 'TraceLocation'

* Delete event registration database on app reset

* Fix detect issue 'MaxLineLength'

* Remove parcelable from TraceLocationEntity.kt

* Map TraceLocationEntity to TraceLocation in TraceLocationRepository

* Use the Instant.seconds extension function

* Use existing EventRegistrationModule.kt instead of creating a new one

* Only delete traceLocations on App reset instead of all tables in TraceLocationRepository.kt

* Add named parameters to TraceLocation mapping

* Add unit test for TraceLocation Mapper

* Add unit tests for EventRegistrationConverters

* Add unit tests for TraceLocationEntity mapping

* Add events database table to 'TraceLocation' database and remove 'EventRegistration' database

* Add database tests for TraceLocations

* Fix issue in EventRegistrationModule.kt

* Add database tests for checkInDao

* Fix detekt maxLineLength issue

* Fix inconsistency in TraceLocationEntity.kt

* Fix ktlint issues

* Inherit from BaseTest or BaseTestInstrumentation in tests

* Fix issue in TraceLocationConverters.kt
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 6 Code Smells

28.9% 28.9% Coverage
0.0% 0.0% Duplication

@d4rken d4rken merged commit 2c5ea8e into release/2.0.x Mar 12, 2021
@d4rken d4rken deleted the feature/5062-event-registration-main branch March 12, 2021 11:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
author merge PR to be merged by author maintainers Tag pull requests created by maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants