mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 20:38:00 +00:00
6e105f662e
* init for views (spooler, handler) * init for views (spooler, handler) * start view in management * granted project * implement granted project view * search granted projects * fix search column * update all projects on project change * search roles * filter org * project members * project grant members * fix tests * application view * project grant search * mock * test appendevents * test appendevents * Update internal/view/query.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/eventstore/spooler/spooler.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/view/query.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * merge request changes * Update internal/project/repository/view/model/application.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * merge request changes * Project view sql (#92) * sql and configs * error handling * sql start in eventstore * on error handling, config * read user on members * Update internal/project/repository/view/application_view.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/application_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_grant_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_grant_member_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_grant_member_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_member_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_member_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/granted_project.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * return caos errors * Update internal/project/repository/view/model/granted_project_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_grant_member.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_grant_member_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_member.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_member_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_role.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/project/repository/view/model/project_role_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/application_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/application_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/project_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * converter fix Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Silvan <silvan.reusser@gmail.com>
123 lines
4.2 KiB
Go
123 lines
4.2 KiB
Go
package grpc
|
|
|
|
import (
|
|
"github.com/caos/logging"
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
|
proj_model "github.com/caos/zitadel/internal/project/model"
|
|
"github.com/golang/protobuf/ptypes"
|
|
)
|
|
|
|
func projectGrantMemberFromModel(member *proj_model.ProjectGrantMember) *ProjectGrantMember {
|
|
creationDate, err := ptypes.TimestampProto(member.CreationDate)
|
|
logging.Log("GRPC-7du3s").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
changeDate, err := ptypes.TimestampProto(member.ChangeDate)
|
|
logging.Log("GRPC-8duew").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
return &ProjectGrantMember{
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
Sequence: member.Sequence,
|
|
UserId: member.UserID,
|
|
Roles: member.Roles,
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberAddToModel(member *ProjectGrantMemberAdd) *proj_model.ProjectGrantMember {
|
|
return &proj_model.ProjectGrantMember{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: member.ProjectId,
|
|
},
|
|
GrantID: member.GrantId,
|
|
UserID: member.UserId,
|
|
Roles: member.Roles,
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberChangeToModel(member *ProjectGrantMemberChange) *proj_model.ProjectGrantMember {
|
|
return &proj_model.ProjectGrantMember{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: member.ProjectId,
|
|
},
|
|
GrantID: member.GrantId,
|
|
UserID: member.UserId,
|
|
Roles: member.Roles,
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberSearchRequestsToModel(role *ProjectGrantMemberSearchRequest) *proj_model.ProjectGrantMemberSearchRequest {
|
|
return &proj_model.ProjectGrantMemberSearchRequest{
|
|
Offset: role.Offset,
|
|
Limit: role.Limit,
|
|
Queries: projectGrantMemberSearchQueriesToModel(role.Queries),
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberSearchQueriesToModel(queries []*ProjectGrantMemberSearchQuery) []*proj_model.ProjectGrantMemberSearchQuery {
|
|
converted := make([]*proj_model.ProjectGrantMemberSearchQuery, len(queries))
|
|
for i, q := range queries {
|
|
converted[i] = projectGrantMemberSearchQueryToModel(q)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func projectGrantMemberSearchQueryToModel(query *ProjectGrantMemberSearchQuery) *proj_model.ProjectGrantMemberSearchQuery {
|
|
return &proj_model.ProjectGrantMemberSearchQuery{
|
|
Key: projectGrantMemberSearchKeyToModel(query.Key),
|
|
Method: searchMethodToModel(query.Method),
|
|
Value: query.Value,
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberSearchKeyToModel(key ProjectGrantMemberSearchKey) proj_model.ProjectGrantMemberSearchKey {
|
|
switch key {
|
|
case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_EMAIL:
|
|
return proj_model.PROJECTGRANTMEMBERSEARCHKEY_EMAIL
|
|
case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME:
|
|
return proj_model.PROJECTGRANTMEMBERSEARCHKEY_FIRST_NAME
|
|
case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME:
|
|
return proj_model.PROJECTGRANTMEMBERSEARCHKEY_LAST_NAME
|
|
case ProjectGrantMemberSearchKey_PROJECTGRANTMEMBERSEARCHKEY_USER_NAME:
|
|
return proj_model.PROJECTGRANTMEMBERSEARCHKEY_USER_NAME
|
|
default:
|
|
return proj_model.PROJECTGRANTMEMBERSEARCHKEY_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberSearchResponseFromModel(response *proj_model.ProjectGrantMemberSearchResponse) *ProjectGrantMemberSearchResponse {
|
|
return &ProjectGrantMemberSearchResponse{
|
|
Offset: response.Offset,
|
|
Limit: response.Limit,
|
|
TotalResult: response.TotalResult,
|
|
Result: projectGrantMemberViewsFromModel(response.Result),
|
|
}
|
|
}
|
|
|
|
func projectGrantMemberViewsFromModel(roles []*proj_model.ProjectGrantMemberView) []*ProjectGrantMemberView {
|
|
converted := make([]*ProjectGrantMemberView, len(roles))
|
|
for i, role := range roles {
|
|
converted[i] = projectGrantMemberViewFromModel(role)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func projectGrantMemberViewFromModel(member *proj_model.ProjectGrantMemberView) *ProjectGrantMemberView {
|
|
creationDate, err := ptypes.TimestampProto(member.CreationDate)
|
|
logging.Log("GRPC-los93").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
changeDate, err := ptypes.TimestampProto(member.ChangeDate)
|
|
logging.Log("GRPC-ski4e").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
return &ProjectGrantMemberView{
|
|
UserId: member.UserID,
|
|
UserName: member.UserName,
|
|
Email: member.Email,
|
|
FirstName: member.FirstName,
|
|
LastName: member.LastName,
|
|
Roles: member.Roles,
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
Sequence: member.Sequence,
|
|
}
|
|
}
|