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.

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

✨ add friend checkin to api #2717

Merged
merged 42 commits into from
Aug 2, 2024
Merged

✨ add friend checkin to api #2717

merged 42 commits into from
Aug 2, 2024

Conversation

MrKrisKrisu
Copy link
Member

@MrKrisKrisu MrKrisKrisu commented Jun 28, 2024

1. Added a new UserSettings to specify who is allowed to checking in for a user (forbidden, friends, list)

friends = following each other
list = see "trusted users" below

2. New Attribute on Checkin-Endpoint "with"

image

3. New Endpoints to manage "trusted users"

Trusted Users are only required, if User allow a specific list of trusted users to check in for them.
image

@MrKrisKrisu MrKrisKrisu marked this pull request as draft June 28, 2024 13:28
@MrKrisKrisu MrKrisKrisu marked this pull request as ready for review July 1, 2024 22:15
@MrKrisKrisu MrKrisKrisu changed the title ✨ add friend checkin ✨ add friend checkin to api Jul 1, 2024
@MrKrisKrisu
Copy link
Member Author

I have received a request to add an expiry date for trusted users, e.g. to use this for time-limited trips.

@MrKrisKrisu MrKrisKrisu marked this pull request as draft July 2, 2024 08:06
Copy link
Member

@HerrLevin HerrLevin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've only finished 5 files out of 24. Will resume in the evening or tomorrow.

app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Resources/TrustedUserResource.php Outdated Show resolved Hide resolved
app/Http/Resources/TrustedUserResource.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/SettingsController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Models/TrustedUser.php Show resolved Hide resolved
app/Models/User.php Show resolved Hide resolved
app/Virtual/Models/CheckinRequestBody.php Show resolved Hide resolved
@MrKrisKrisu MrKrisKrisu marked this pull request as ready for review July 7, 2024 17:38
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TrustedUserController.php Outdated Show resolved Hide resolved
storage/api-docs/api-docs.json Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
app/Http/Controllers/API/v1/TransportController.php Outdated Show resolved Hide resolved
MrKrisKrisu and others added 5 commits July 13, 2024 14:54
Co-authored-by: Levin Herr <github@17d.me>
Co-authored-by: Levin Herr <github@17d.me>
Co-authored-by: Levin Herr <github@17d.me>
# Conflicts:
#	app/Http/Controllers/API/v1/SettingsController.php
#	app/Http/Controllers/API/v1/TransportController.php
#	app/Models/User.php
#	resources/views/includes/status.blade.php
#	storage/api-docs/api-docs.json
@HerrLevin
Copy link
Member

@MrKrisKrisu Hab's behoben/gemerged. Aber bitte teste dein feature einmal manuell durch, ob alles passt. Und auch ob ich nicht aus versehen was von dir beim Konflikte beheben gelöscht hab

@MrKrisKrisu
Copy link
Member Author

@MrKrisKrisu Hab's behoben/gemerged. Aber bitte teste dein feature einmal manuell durch, ob alles passt. Und auch ob ich nicht aus versehen was von dir beim Konflikte beheben gelöscht hab

Danke. Von meiner Seite aus passt alles noch.

@HerrLevin HerrLevin merged commit f971265 into develop Aug 2, 2024
8 checks passed
@HerrLevin HerrLevin deleted the dev-ks/friend-checkin branch August 2, 2024 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants