change activity model to event

pro/controllers/events.go

@@ -22,7 +22,7 @@ func EventHandlers(r *mux.Router) {
 func listActivity(w http.ResponseWriter, r *http.Request) {
 	netID := r.URL.Query().Get("network_id")
 	var err error
-	netActivity, err := (&schema.Activity{NetworkID: models.NetworkID(netID)}).List(r.Context())
+	netActivity, err := (&schema.Event{NetworkID: models.NetworkID(netID)}).List(r.Context())
 	if err != nil {
 		logic.ReturnErrorResponse(w, r, models.ErrorResponse{
 			Code:    http.StatusInternalServerError,

pro/logic/events.go

@@ -22,7 +22,7 @@ func EventWatcher() {
 	for e := range EventActivityCh {
 		sourceJson, _ := json.Marshal(e.Source)
 		dstJson, _ := json.Marshal(e.Target)
-		a := schema.Activity{
+		a := schema.Event{
 			ID:        uuid.New().String(),
 			Action:    e.Action,
 			Source:    sourceJson,

schema/activity.go → schema/event.go

@@ -9,7 +9,7 @@ import (
 	"gorm.io/datatypes"
 )
 
-type Activity struct {
+type Event struct {
 	ID        string           `gorm:"primaryKey" json:"id"`
 	Action    models.Action    `gorm:"action" json:"action"`
 	Source    datatypes.JSON   `gorm:"source" json:"source"`
@@ -19,19 +19,19 @@ type Activity struct {
 	TimeStamp time.Time        `gorm:"time_stamp" json:"time_stamp"`
 }
 
-func (a *Activity) Get(ctx context.Context) error {
-	return db.FromContext(ctx).Model(&Activity{}).First(&a).Where("id = ?", a.ID).Error
+func (a *Event) Get(ctx context.Context) error {
+	return db.FromContext(ctx).Model(&Event{}).First(&a).Where("id = ?", a.ID).Error
 }
 
-func (a *Activity) Update(ctx context.Context) error {
-	return db.FromContext(ctx).Model(&Activity{}).Where("id = ?", a.ID).Updates(&a).Error
+func (a *Event) Update(ctx context.Context) error {
+	return db.FromContext(ctx).Model(&Event{}).Where("id = ?", a.ID).Updates(&a).Error
 }
 
-func (a *Activity) Create(ctx context.Context) error {
-	return db.FromContext(ctx).Model(&Activity{}).Create(&a).Error
+func (a *Event) Create(ctx context.Context) error {
+	return db.FromContext(ctx).Model(&Event{}).Create(&a).Error
 }
 
-func (a *Activity) List(ctx context.Context) (ats []Activity, err error) {
-	err = db.FromContext(ctx).Model(&Activity{}).Find(&ats).Error
+func (a *Event) List(ctx context.Context) (ats []Event, err error) {
+	err = db.FromContext(ctx).Model(&Event{}).Find(&ats).Error
 	return
 }

schema/models.go

@@ -6,6 +6,6 @@ func ListModels() []interface{} {
 		&Job{},
 		&Egress{},
 		&UserAccessToken{},
-		&Activity{},
+		&Event{},
 	}
 }