Migration to Navigatum #1462

PiotrKedra · 2022-07-04T16:09:11Z

Issue

This fixes the following issue(s):

Resolves: Migrate the Roomfinder to NavigaTUM #1451
Resolves: Allow to open Roomfinder location in other apps like Google Maps #1456
Resolves: Room maps not loading #1338
Resolves: Add the detailed zoom map to the roomfinder #415
Resolves: Roomfinder shows wrong locations #1182

Depending on merging centralized search #1457, I decided to work on this PR rather than the master branch because I used some room finder logic there.

Description

Migrate to:

more information nav.tum.sexy/api/get/:id api-endpint
the search nav.tum.sexy/api/search?q=querry api-endpoint

- new navigation details screen - integrate NavigaTumApi to centralized search

- move to new navigation details view

PiotrKedra · 2022-07-10T19:29:10Z

Migration more or less should be ready. I have migrated three roomfinder endpoints:

fetchAvailableMaps()
fetchRooms()
fetchCoordinates()
Into two NavigaTum endpoints (search navigation and navigation details)

What is still to be done?

remove old roomfinder logic (didn't remove it yet because of the below problems)
besides migration I want to slightly improve the navigation details UI (now it only displays sitemap plan), to sth like on the NavigaTum website. Also, I want to allow to open location in other apps Allow to open Roomfinder location in other apps like Google Maps #1456.

Problems/questions

I heard that NavigaTum is not stable yet, therefore can it be merged now?
Old roomfinder API has an endpoint that fetches RoomFinderSchedule. However, I couldn't make this code run in the App, so I am not sure if this is still supported or it can be removed?
Barrier-free API fetches rooms that have ID from the old roomfinder API and using NavigaTum with this ID does not work. Therefore, now when users click on the Barrier-free facility, the app redirects to the search screen with this facility address as a query input. Is this solution ok?

CommanderStorm · 2022-07-13T20:46:42Z

I heard that NavigaTum is not stable yet, therefore can it be merged now?

If we comment on TUM-Dev/NavigaTUM#130 about the change timeline, it is stable ;)

Old roomfinder API has an endpoint that fetches RoomFinderSchedule. However, I couldn't make this code run in the App, so I am not sure if this is still supported or it can be removed?

@joschahenningsen historically What is the status on this? Was this ever used in the app?

Barrier-free API fetches rooms that have ID from the old roomfinder API and using NavigaTum with this ID does not work. Therefore, now when users click on the Barrier-free facility, the app redirects to the search screen with this facility address as a query input. Is this solution ok?

@joschahenningsen Can we migrate the backend (add a new field?)

joschahenningsen · 2022-07-17T20:12:30Z

@joschahenningsen historically What is the status on this? Was this ever used in the app?

I think this might be used in the calendar somewhere. I'll need to do some more digging though.

@joschahenningsen Can we migrate the backend (add a new field?)

Sure, as long as it does not break old clients :) Do you have a way of mapping those ids?

On another note: Do y'all need some help with the merge conflicts? :D

PiotrKedra · 2022-07-18T21:32:25Z

I have implemented a new UI, so it has more information. Users can choose between all available site plans and zoom in and out. Besides that, users can open location in other apps that can handle geo-locations as input (#1456). Also, there is a button for a future interactive map, for now it just redirects to the NavigaTum website (idk if some1 is working on an interactive map right now #1437)

PiotrKedra · 2022-07-23T18:14:41Z

RoomFinderSchedule

I did some digging into this secret RoomFinderSchedule logic ;p

Old roomfinder API has an endpoint that fetches RoomFinderSchedule. However, I couldn't make this code run in the App, so I am not sure if this is still supported or it can be removed?

I find out that this logic was not available to execute after these two commits:

In both these commits, it looks like this might be removed accidentally, but cannot be sure. However, it looks like, since April 2018 this RoomFinderSchedule feature does not work, so I think it would be best to deal with this problem in a separate issue. Also since it was not available for so long, there is a question if anybody needs it.

Barrier-free API

Another case is what shall we do with this Barrier-free API

Barrier-free API fetches rooms that have ID from the old roomfinder API and using NavigaTum with this ID does not work. Therefore, now when users click on the Barrier-free facility, the app redirects to the search screen with this facility address as a query input. Is this solution ok?

Should we wait for TUM-Dev/Campus-Backend#80 to be merged and ready to use, so it can be implemented here as well? Or we just merge this PR now with my temporary solutions and take care of Barrier-free in another one? @CommanderStorm

CommanderStorm · 2022-07-23T21:36:29Z

Should we wait for TUM-Dev/Campus-Backend#80 to be merged and ready to use, so it can be implemented here as well? Or we just merge this PR now with my temporary solutions and take care of Barrier-free in another one? @CommanderStorm

Actually, we don't need to wait for that PR, as the current backend does already provide us with the exact information we need:

When looking in the network tab, room_code is the ID, NavigaTUM uses, so probably we can simplify this UX a bit.
The study rooms also one place where we already have this field. (it is named code in the data class)
Thus, we can redirect directly to showing the room.

Doing so should cover all cases, since the fixes we added for invalid room_codes do not relate to study rooms or barierfree. Redirect to the details page for the search results sould be save here..

However, if you like, we can use your solution and migrate all occurrences of the room_id to room_code in a later PR…

…avigatum � Conflicts: � app/src/main/AndroidManifest.xml � app/src/main/java/de/tum/in/tumcampusapp/api/app/TUMCabeClient.java � app/src/main/java/de/tum/in/tumcampusapp/component/other/general/RecentsDao.java � app/src/main/java/de/tum/in/tumcampusapp/component/other/locations/LocationManager.kt � app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarDetailsFragment.kt � app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomfinder/model/RoomFinderRoom.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/barrierfree/BarrierFreeFacilitiesActivity.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/SearchFragment.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/SearchResult.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/SearchResultState.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/SearchResultType.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/SearchViewModel.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/adapter/RecentSearchesAdapter.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/adapter/ResultTypesAdapter.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/adapter/SearchResultsAdapter.kt � app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/di/SearchComponent.kt � app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt � app/src/main/res/layout/activity_search.xml � app/src/main/res/layout/fragment_search.xml � app/src/main/res/layout/toolbar_search.xml � app/src/main/res/values-de/strings.xml � app/src/main/res/values/strings.xml

CommanderStorm · 2022-07-25T21:41:37Z

Thanks for the extensive review :) WIth most of the comments I agree. I think it would be better If I aggregate these changes into one commit, rather than one by one by clicking here on GitHub (there will be long history ;d)? But I don't know what is better, I see these commit suggestions for the first time ^^

What works for you…
You don't have to worry about a long history, since all changes are squashed into one commit anyway 😉

When it comes to ordering since there are four different objects fetched in a centralized search. The "All results" sort alphabetically all of them, but when you choose a specific object type, then the ordering is as it was fetched from APIs. I added sorting because I thought it was slightly better to mix the results alphabetically than display groups of objects one by one (firstly all people, then all lectures, then all buildings and rooms). This was my reasoning, what do you think? :D

For rooms/buildings, this definitively does not make sense, as we have a priority between our items.
For people and lectures I dont know this for certain, but I assume they are also sorted somehow.

We should therefore just drop this sorting. Finding a total order between these items is not trivial and should be its PR

From an ordering, I would therefore prefer:

people
building/room (in the order we communicate if possible)
lectures

Assumptions being,

that there are few human names that map intersect with buildings/rooms and therefore this can be first without causing much of a bad impact.
Searching for your lectures is something you rarely do in a campus app

PiotrKedra · 2022-07-29T15:38:17Z

Ok, I will reimplement the ordering as u suggest and other fixes , but probably I will do it next week after my exams

Bentipa · 2022-07-31T10:01:11Z

I will take another look once @PiotrKedra has implemented the changes, just tag me again then please :)

app/src/main/java/de/tum/in/tumcampusapp/api/navigatum/domain/NavigationEntity.kt

….java Co-authored-by: Frank Elsinga <[email protected]>

…NavigationMap.kt Co-authored-by: Frank Elsinga <[email protected]>

…al/RecentsDao.java Co-authored-by: Frank Elsinga <[email protected]>

…earchFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

…inder/NavigationDetailsFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

Co-authored-by: Frank Elsinga <[email protected]>

…inder/NavigationDetailsFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

…atum � Conflicts: � app/src/main/res/values-de/strings.xml � app/src/main/res/values/strings.xml

PiotrKedra · 2022-08-09T12:44:08Z

I have implemented changes, and also left comments on some conversations
@Bentipa

CommanderStorm

imo this can be merged. All my major comments have been adressed.
@Bentipa do you want to review it, or should I merge it?

CommanderStorm · 2022-08-10T17:37:41Z

@PiotrKedra Thanks for the wonderful work you did ✨

Bentipa · 2022-08-10T18:07:54Z

@CommanderStorm Just gave it a quick look cause of time reasons, but looks good overall to me. So we can merge it.

PiotrKedra added 10 commits June 7, 2022 21:58

basic search

bfc1f0b

add rooms & lectures

f355080

design + fix search aggregation

75aab57

add result types

1ab17b9

improve user experience

ad03083

add search history

3fe1546

adjustments + refactor

64ef100

remove legacy searches

24016d3

fix ktlint issues

615c340

- migrate to NavigaTum

c06c871

- new navigation details screen - integrate NavigaTumApi to centralized search

CommanderStorm assigned PiotrKedra Jul 4, 2022

CommanderStorm changed the title ~~Navigatum migration~~ Migration to Navigatum Jul 4, 2022

PiotrKedra added 2 commits July 8, 2022 12:58

moved from roomfinder to navigatum

5b64a50

- fix map rendering

e3c6ca0

- move to new navigation details view

CommanderStorm mentioned this pull request Jul 12, 2022

Bump getmeili/meilisearch from v0.27.2 to v0.28.0 in /server TUM-Dev/NavigaTUM#162

Merged

CommanderStorm mentioned this pull request Jul 17, 2022

Add All RPC Endpoints TUM-Dev/Campus-Backend#80

Merged

new navigation UI

a5e6aff

PiotrKedra mentioned this pull request Jul 18, 2022

Announcement issue for breaking API changes TUM-Dev/NavigaTUM#130

Open

CommanderStorm added Feature 🎉 Work in progress Roomfinder Related to the the Romfinder labels Jul 24, 2022

PiotrKedra added 3 commits July 24, 2022 19:16

add room_code parameter and move to bindings

3c7fa70

adjustments after merge

ca4e35e

CommanderStorm added the ReleaseBlocker label Jul 29, 2022

CommanderStorm marked this pull request as draft August 1, 2022 16:30

CommanderStorm mentioned this pull request Aug 1, 2022

API highlight control TUM-Dev/NavigaTUM#179

Merged

octycs reviewed Aug 6, 2022

View reviewed changes

app/src/main/java/de/tum/in/tumcampusapp/api/navigatum/domain/NavigationEntity.kt Outdated Show resolved Hide resolved

PiotrKedra and others added 11 commits August 8, 2022 18:49

Update app/src/main/java/de/tum/in/tumcampusapp/api/app/TUMCabeClient…

a37d422

….java Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/java/de/tum/in/tumcampusapp/api/navigatum/domain/…

b37b527

…NavigationMap.kt Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/java/de/tum/in/tumcampusapp/component/other/gener…

026cb51

…al/RecentsDao.java Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/java/de/tum/in/tumcampusapp/component/ui/search/S…

acbf64b

…earchFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomf…

661b2b0

…inder/NavigationDetailsFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/res/values-de/strings.xml

ef6f1b0

Co-authored-by: Frank Elsinga <[email protected]>

Update app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomf…

72e7444

…inder/NavigationDetailsFragment.kt Co-authored-by: Frank Elsinga <[email protected]>

general fixes

7c9c6fb

fix ordering

bc32a87

Merge branch 'master' of github.com:TUM-Dev/Campus-Android into navig…

cf5e346

…atum � Conflicts: � app/src/main/res/values-de/strings.xml � app/src/main/res/values/strings.xml

fix lint

ec6a9db

PiotrKedra marked this pull request as ready for review August 9, 2022 12:44

CommanderStorm approved these changes Aug 10, 2022

View reviewed changes

Bentipa approved these changes Aug 10, 2022

View reviewed changes

CommanderStorm added 2 commits August 10, 2022 20:55

Merge branch 'master' into navigatum_migration

5690d1c

Merge branch 'master' into navigatum_migration

fdf9947

CommanderStorm enabled auto-merge (squash) August 10, 2022 18:55

CommanderStorm merged commit e697dd7 into TUM-Dev:master Aug 10, 2022

This was referenced Sep 15, 2022

[Feature] Navigation API Translation #1510

Closed

New NavigaTUM lang parameter for api/get/:id and api/preview/:id TUM-Dev/Campus-iOS#487

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migration to Navigatum #1462

Migration to Navigatum #1462

PiotrKedra commented Jul 4, 2022 •

edited by CommanderStorm

Loading

PiotrKedra commented Jul 10, 2022 •

edited by CommanderStorm

Loading

CommanderStorm commented Jul 13, 2022 •

edited

Loading

joschahenningsen commented Jul 17, 2022

PiotrKedra commented Jul 18, 2022 •

edited

Loading

PiotrKedra commented Jul 23, 2022

CommanderStorm commented Jul 23, 2022

CommanderStorm commented Jul 25, 2022

PiotrKedra commented Jul 29, 2022 •

edited

Loading

Bentipa commented Jul 31, 2022

PiotrKedra commented Aug 9, 2022

CommanderStorm left a comment

CommanderStorm commented Aug 10, 2022

Bentipa commented Aug 10, 2022

Migration to Navigatum #1462

Migration to Navigatum #1462

Conversation

PiotrKedra commented Jul 4, 2022 • edited by CommanderStorm Loading

Issue

Description

PiotrKedra commented Jul 10, 2022 • edited by CommanderStorm Loading

What is still to be done?

Problems/questions

CommanderStorm commented Jul 13, 2022 • edited Loading

joschahenningsen commented Jul 17, 2022

PiotrKedra commented Jul 18, 2022 • edited Loading

PiotrKedra commented Jul 23, 2022

RoomFinderSchedule

Barrier-free API

CommanderStorm commented Jul 23, 2022

CommanderStorm commented Jul 25, 2022

PiotrKedra commented Jul 29, 2022 • edited Loading

Bentipa commented Jul 31, 2022

PiotrKedra commented Aug 9, 2022

CommanderStorm left a comment

Choose a reason for hiding this comment

CommanderStorm commented Aug 10, 2022

Bentipa commented Aug 10, 2022

PiotrKedra commented Jul 4, 2022 •

edited by CommanderStorm

Loading

PiotrKedra commented Jul 10, 2022 •

edited by CommanderStorm

Loading

CommanderStorm commented Jul 13, 2022 •

edited

Loading

PiotrKedra commented Jul 18, 2022 •

edited

Loading

PiotrKedra commented Jul 29, 2022 •

edited

Loading