feat: add qualification access logic

Signed-off-by: Alexander Trost <[email protected]>
fivenet-app · Nov 18, 2024 · ea3af48 · ea3af48
1 parent 746ecbe
commit ea3af48
Show file tree

Hide file tree

Showing 31 changed files with 1,072 additions and 377 deletions.
diff --git a/app/components/mailer/ThreadCreateOrUpdateModal.vue b/app/components/mailer/ThreadCreateOrUpdateModal.vue
@@ -33,13 +33,7 @@ async function createThread(values: Schema): Promise<void> {
     await mailerStore.createThread({
         thread: {
             id: '0',
-            recipients: [
-                {
-                    id: '0',
-                    emailId: '1',
-                    targetId: '2',
-                },
-            ],
+            recipients: [],
             creatorEmailId: '1',
             creatorId: activeChar.value!.userId,
             title: values.title,
@@ -54,6 +48,8 @@ async function createThread(values: Schema): Promise<void> {
             creatorId: activeChar.value!.userId,
             creatorJob: activeChar.value!.job,
         },
+
+        recipients: [],
     });
 
     isOpen.value = false;

diff --git a/gen/go/proto/resources/mailer/access.go b/gen/go/proto/resources/mailer/access.go
@@ -21,3 +21,11 @@ func (x *UserAccess) SetUserId(id int32) {
 func (x *UserAccess) SetAccess(access AccessLevel) {
 	x.Access = access
 }
+
+func (x *QualificationAccess) SetQualificationId(id uint64) {
+	x.QualificationId = id
+}
+
+func (x *QualificationAccess) SetAccess(access AccessLevel) {
+	x.Access = access
+}
diff --git a/gen/go/proto/resources/mailer/thread.pb.go b/gen/go/proto/resources/mailer/thread.pb.go
diff --git a/gen/go/proto/resources/mailer/thread.pb.validate.go b/gen/go/proto/resources/mailer/thread.pb.validate.go
diff --git a/gen/go/proto/services/calendar/calendar.go b/gen/go/proto/services/calendar/calendar.go
@@ -45,7 +45,7 @@ type Server struct {
 	notif    notifi.INotifi
 	js       *events.JSWrapper
 
-	access *access.Grouped[calendar.CalendarJobAccess, *calendar.CalendarJobAccess, calendar.CalendarUserAccess, *calendar.CalendarUserAccess, calendar.AccessLevel]
+	access *access.Grouped[calendar.CalendarJobAccess, *calendar.CalendarJobAccess, calendar.CalendarUserAccess, *calendar.CalendarUserAccess, access.DummyQualificationAccess[calendar.AccessLevel], *access.DummyQualificationAccess[calendar.AccessLevel], calendar.AccessLevel]
 }
 
 type Params struct {
@@ -71,7 +71,7 @@ func NewServer(p Params) *Server {
 		appCfg:   p.AppConfig,
 		notif:    p.Notif,
 		js:       p.JS,
-		access: access.NewGrouped(
+		access: access.NewGrouped[calendar.CalendarJobAccess, *calendar.CalendarJobAccess, calendar.CalendarUserAccess, *calendar.CalendarUserAccess, access.DummyQualificationAccess[calendar.AccessLevel], *access.DummyQualificationAccess[calendar.AccessLevel], calendar.AccessLevel](
 			p.DB,
 			table.FivenetDocuments,
 			&access.TargetTableColumns{
@@ -126,6 +126,7 @@ func NewServer(p Params) *Server {
 					UserId: table.FivenetCalendarUserAccess.AS("calendar_user_access").UserID,
 				},
 			),
+			nil,
 		),
 	}
 }

diff --git a/gen/go/proto/services/calendar/calendars.go b/gen/go/proto/services/calendar/calendars.go
@@ -378,7 +378,7 @@ func (s *Server) CreateOrUpdateCalendar(ctx context.Context, req *CreateOrUpdate
 		auditEntry.State = int16(rector.EventType_EVENT_TYPE_CREATED)
 	}
 
-	if _, err := s.access.HandleAccessChanges(ctx, tx, req.Calendar.Id, req.Calendar.Access.Jobs, req.Calendar.Access.Users); err != nil {
+	if _, err := s.access.HandleAccessChanges(ctx, tx, req.Calendar.Id, req.Calendar.Access.Jobs, req.Calendar.Access.Users, nil); err != nil {
 		return nil, errswrap.NewError(err, errorscalendar.ErrFailedQuery)
 	}
 

diff --git a/gen/go/proto/services/docstore/docstore.go b/gen/go/proto/services/docstore/docstore.go
@@ -63,8 +63,8 @@ type Server struct {
 	notif    notifi.INotifi
 	htmlDiff *htmldiffer.Differ
 
-	access         *access.Grouped[documents.DocumentJobAccess, *documents.DocumentJobAccess, documents.DocumentUserAccess, *documents.DocumentUserAccess, documents.AccessLevel]
-	templateAccess *access.Grouped[documents.TemplateJobAccess, *documents.TemplateJobAccess, documents.TemplateUserAccess, *documents.TemplateUserAccess, documents.AccessLevel]
+	access         *access.Grouped[documents.DocumentJobAccess, *documents.DocumentJobAccess, documents.DocumentUserAccess, *documents.DocumentUserAccess, access.DummyQualificationAccess[documents.AccessLevel], *access.DummyQualificationAccess[documents.AccessLevel], documents.AccessLevel]
+	templateAccess *access.Grouped[documents.TemplateJobAccess, *documents.TemplateJobAccess, documents.TemplateUserAccess, *documents.TemplateUserAccess, access.DummyQualificationAccess[documents.AccessLevel], *access.DummyQualificationAccess[documents.AccessLevel], documents.AccessLevel]
 }
 
 type Params struct {
@@ -91,7 +91,7 @@ func NewServer(p Params) *Server {
 		notif:    p.Notif,
 		htmlDiff: p.HTMLDiffer,
 
-		access: access.NewGrouped(
+		access: access.NewGrouped[documents.DocumentJobAccess, *documents.DocumentJobAccess, documents.DocumentUserAccess, *documents.DocumentUserAccess, access.DummyQualificationAccess[documents.AccessLevel], *access.DummyQualificationAccess[documents.AccessLevel], documents.AccessLevel](
 			p.DB,
 			table.FivenetDocuments,
 			&access.TargetTableColumns{
@@ -146,9 +146,10 @@ func NewServer(p Params) *Server {
 					UserId: table.FivenetDocumentsUserAccess.AS("document_user_access").UserID,
 				},
 			),
+			nil,
 		),
 
-		templateAccess: access.NewGrouped[documents.TemplateJobAccess, *documents.TemplateJobAccess, documents.TemplateUserAccess, *documents.TemplateUserAccess, documents.AccessLevel](
+		templateAccess: access.NewGrouped[documents.TemplateJobAccess, *documents.TemplateJobAccess, documents.TemplateUserAccess, *documents.TemplateUserAccess, access.DummyQualificationAccess[documents.AccessLevel], *access.DummyQualificationAccess[documents.AccessLevel], documents.AccessLevel](
 			p.DB,
 			table.FivenetDocumentsTemplates,
 			&access.TargetTableColumns{
@@ -182,6 +183,7 @@ func NewServer(p Params) *Server {
 				},
 			),
 			nil,
+			nil,
 		),
 	}
 }
@@ -496,7 +498,7 @@ func (s *Server) CreateDocument(ctx context.Context, req *CreateDocumentRequest)
 		return nil, errswrap.NewError(err, errorsdocstore.ErrFailedQuery)
 	}
 
-	if _, err := s.access.HandleAccessChanges(ctx, tx, uint64(lastId), req.Access.Jobs, req.Access.Users); err != nil {
+	if _, err := s.access.HandleAccessChanges(ctx, tx, uint64(lastId), req.Access.Jobs, req.Access.Users, nil); err != nil {
 		if dbutils.IsDuplicateError(err) {
 			return nil, errswrap.NewError(err, errorsdocstore.ErrDocAccessDuplicate)
 		}

diff --git a/gen/go/proto/services/docstore/documents_access.go b/gen/go/proto/services/docstore/documents_access.go
@@ -113,7 +113,7 @@ func (s *Server) getDocumentAccess(ctx context.Context, documentId uint64) (*doc
 }
 
 func (s *Server) handleDocumentAccessChange(ctx context.Context, tx qrm.DB, documentId uint64, userInfo *userinfo.UserInfo, access *documents.DocumentAccess, addActivity bool) error {
-	changes, err := s.access.HandleAccessChanges(ctx, tx, documentId, access.Jobs, access.Users)
+	changes, err := s.access.HandleAccessChanges(ctx, tx, documentId, access.Jobs, access.Users, nil)
 	if err != nil {
 		if dbutils.IsDuplicateError(err) {
 			return errswrap.NewError(err, errorsdocstore.ErrDocAccessDuplicate)

diff --git a/gen/go/proto/services/docstore/templates.go b/gen/go/proto/services/docstore/templates.go
@@ -286,7 +286,7 @@ func (s *Server) CreateTemplate(ctx context.Context, req *CreateTemplateRequest)
 		return nil, errswrap.NewError(err, errorsdocstore.ErrFailedQuery)
 	}
 
-	if _, err := s.templateAccess.HandleAccessChanges(ctx, tx, uint64(lastId), req.Template.JobAccess, nil); err != nil {
+	if _, err := s.templateAccess.HandleAccessChanges(ctx, tx, uint64(lastId), req.Template.JobAccess, nil, nil); err != nil {
 		if dbutils.IsDuplicateError(err) {
 			return nil, errswrap.NewError(err, errorsdocstore.ErrTemplateAccessDuplicate)
 		}
@@ -382,7 +382,7 @@ func (s *Server) UpdateTemplate(ctx context.Context, req *UpdateTemplateRequest)
 		return nil, errswrap.NewError(err, errorsdocstore.ErrFailedQuery)
 	}
 
-	if _, err := s.templateAccess.HandleAccessChanges(ctx, tx, req.Template.Id, req.Template.JobAccess, nil); err != nil {
+	if _, err := s.templateAccess.HandleAccessChanges(ctx, tx, req.Template.Id, req.Template.JobAccess, nil, nil); err != nil {
 		if dbutils.IsDuplicateError(err) {
 			return nil, errswrap.NewError(err, errorsdocstore.ErrTemplateAccessDuplicate)
 		}