Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
b16127c1
Commit
b16127c1
authored
2 years ago
by
Henrich Neumann
Browse files
Options
Downloads
Patches
Plain Diff
Change ordering of imports
This fixes the linting error in the pipeline.
parent
77a63c9c
No related branches found
Branches containing commit
No related tags found
1 merge request
!353
Create endpoint for inviting a guest
Pipeline
#161300
passed
2 years ago
Stage: venv update
Stage: tests and linting
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
greg/api/serializers/invitation.py
+2
-1
2 additions, 1 deletion
greg/api/serializers/invitation.py
greg/api/views/invitation.py
+3
-2
3 additions, 2 deletions
greg/api/views/invitation.py
greg/tests/api/test_invitation.py
+4
-3
4 additions, 3 deletions
greg/tests/api/test_invitation.py
with
9 additions
and
6 deletions
greg/api/serializers/invitation.py
+
2
−
1
View file @
b16127c1
from
datetime
import
timedelta
from
datetime
import
timedelta
from
rest_framework
import
serializers
from
django.conf
import
settings
from
django.conf
import
settings
from
django.db
import
transaction
from
django.db
import
transaction
from
django.utils
import
timezone
from
django.utils
import
timezone
from
greg.api.serializers.role
import
RoleInvitationSerializer
from
greg.api.serializers.role
import
RoleInvitationSerializer
from
greg.models
import
Identity
,
Invitation
,
InvitationLink
,
Person
,
Role
,
Sponsor
from
greg.models
import
Identity
,
Invitation
,
InvitationLink
,
Person
,
Role
,
Sponsor
from
greg.utils
import
is_identity_duplicate
from
greg.utils
import
is_identity_duplicate
from
gregui.api.serializers.identity
import
IdentityDuplicateError
from
gregui.api.serializers.identity
import
IdentityDuplicateError
from
rest_framework
import
serializers
class
InvitationSerializer
(
serializers
.
ModelSerializer
):
class
InvitationSerializer
(
serializers
.
ModelSerializer
):
...
...
This diff is collapsed.
Click to expand it.
greg/api/views/invitation.py
+
3
−
2
View file @
b16127c1
from
rest_framework
import
permissions
,
status
,
viewsets
from
rest_framework.response
import
Response
from
greg.api.serializers.invitation
import
InvitationSerializer
from
greg.api.serializers.invitation
import
InvitationSerializer
from
greg.models
import
InvitationLink
,
Sponsor
from
greg.models
import
InvitationLink
,
Sponsor
from
gregui.mailutils.invite_guest
import
InviteGuest
from
gregui.mailutils.invite_guest
import
InviteGuest
from
rest_framework
import
permissions
,
status
,
viewsets
from
rest_framework.response
import
Response
class
InvitationViewSet
(
viewsets
.
ModelViewSet
):
class
InvitationViewSet
(
viewsets
.
ModelViewSet
):
...
...
This diff is collapsed.
Click to expand it.
greg/tests/api/test_invitation.py
+
4
−
3
View file @
b16127c1
...
@@ -2,13 +2,14 @@ from typing import Dict
...
@@ -2,13 +2,14 @@ from typing import Dict
from
unittest.mock
import
patch
from
unittest.mock
import
patch
import
pytest
import
pytest
from
greg.models
import
OrganizationalUnit
,
Person
,
RoleType
,
Sponsor
from
gregui.api.views.invitation
import
InvitationLink
from
gregui.mailutils.invite_guest
import
InviteGuest
from
rest_framework
import
status
from
rest_framework
import
status
from
rest_framework.reverse
import
reverse
from
rest_framework.reverse
import
reverse
from
rest_framework.test
import
APIClient
from
rest_framework.test
import
APIClient
from
greg.models
import
OrganizationalUnit
,
Person
,
RoleType
,
Sponsor
from
gregui.api.views.invitation
import
InvitationLink
from
gregui.mailutils.invite_guest
import
InviteGuest
@pytest.fixture
@pytest.fixture
def
data
(
sponsor_guy
:
Sponsor
,
unit_foo
:
OrganizationalUnit
)
->
Dict
:
def
data
(
sponsor_guy
:
Sponsor
,
unit_foo
:
OrganizationalUnit
)
->
Dict
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment