kruto

twirapp · Oct 15, 2024 · 3b3a8cb · 3b3a8cb
1 parent 84068f0
commit 3b3a8cb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 16 deletions.
diff --git a/apps/api-gql/internal/gql/mappers/audit-logs.go b/apps/api-gql/internal/gql/mappers/audit-logs.go
@@ -17,3 +17,16 @@ func AuditTypeModelToGql(t model.AuditOperationType) gqlmodel.AuditOperationType
 		return ""
 	}
 }
+
+func AuditTypeGqlToModel(t gqlmodel.AuditOperationType) model.AuditOperationType {
+	switch t {
+	case gqlmodel.AuditOperationTypeUpdate:
+		return model.AuditOperationUpdate
+	case gqlmodel.AuditOperationTypeCreate:
+		return model.AuditOperationCreate
+	case gqlmodel.AuditOperationTypeDelete:
+		return model.AuditOperationDelete
+	default:
+		return ""
+	}
+}
diff --git a/apps/api-gql/internal/gql/resolvers/admin-audit-logs.resolver.go b/apps/api-gql/internal/gql/resolvers/admin-audit-logs.resolver.go
diff --git a/apps/api-gql/schema/admin-audit-logs.graphqls b/apps/api-gql/schema/admin-audit-logs.graphqls
@@ -6,7 +6,7 @@ input AdminAuditLogsInput {
 	table: String
 	objectId: String
 	userId: String
-	dashboardId: String
+	channelId: String
 	operationType: AuditOperationType
 	page: Int
 	perPage: Int
@@ -20,11 +20,11 @@ type AdminAuditLog {
 	newValue: String
 	objectId: String
 	userId: String
-	dashboardId: String
+	channelId: String
 	createdAt: Time!
 
 	user: TwirUserTwitchInfo @goField(forceResolver: true)
-	dashboardUser: TwirUserTwitchInfo @goField(forceResolver: true)
+	channel: TwirUserTwitchInfo @goField(forceResolver: true)
 }
 
 enum AuditOperationType {

diff --git a/libs/baseapp/gorm-audit-hooks.go b/libs/baseapp/gorm-audit-hooks.go
@@ -40,7 +40,7 @@ func (c *gormAuditHooks) create(tx *gorm.DB) {
 		NewValue:      null.StringFrom(prepareData(recordMap)),
 		ObjectID:      null.StringFrom(objId),
 		UserID:        null.StringFromPtr(userID),
-		DashboardID:   null.StringFromPtr(dashboardID),
+		ChannelID:     null.StringFromPtr(dashboardID),
 	}
 
 	if err := tx.Session(
@@ -79,7 +79,7 @@ func (c *gormAuditHooks) delete(tx *gorm.DB) {
 		OldValue:      null.StringFrom(prepareData(recordMap)),
 		ObjectID:      null.StringFrom(objId),
 		UserID:        null.StringFromPtr(userID),
-		DashboardID:   null.StringFromPtr(dashboardID),
+		ChannelID:     null.StringFromPtr(dashboardID),
 	}
 
 	if err := tx.Session(
@@ -118,7 +118,7 @@ func (c *gormAuditHooks) update(tx *gorm.DB) {
 		NewValue:      null.StringFrom(prepareData(recordMap)),
 		ObjectID:      null.StringFrom(objId),
 		UserID:        null.StringFromPtr(userID),
-		DashboardID:   null.StringFromPtr(dashboardID),
+		ChannelID:     null.StringFromPtr(dashboardID),
 	}
 
 	if err := tx.Session(

diff --git a/libs/gomodels/audit-log.go b/libs/gomodels/audit-log.go
@@ -14,12 +14,12 @@ type AuditLog struct {
 	OldValue      null.String        `gorm:"column:old_value;type:text"`
 	NewValue      null.String        `gorm:"column:new_value;type:text"`
 	ObjectID      null.String        `gorm:"column:object_id;type:uuid"`
+	ChannelID     null.String        `gorm:"column:channel_id;type:uuid"`
 	UserID        null.String        `gorm:"column:user_id;type:uuid"`
-	DashboardID   null.String        `gorm:"column:dashboard_id;type:uuid"`
 	CreatedAt     time.Time          `gorm:"column:created_at;type:timestamp;default:now()"`
 
-	User      *Users `gorm:"foreignKey:UserID"`
-	Dashboard *Users `gorm:"foreignKey:DashboardID"`
+	Channel *Users `gorm:"foreignKey:ChannelID"`
+	User    *Users `gorm:"foreignKey:UserID"`
 }
 
 func (c *AuditLog) TableName() string {