Added BeforeSave

models/crm_invoice_config.go

@@ -23,8 +23,8 @@ type CrmInvoiceConfig struct {
 	PartnerAudioBookingBH *string `gorm:"column:partner_audio_booking_bh" json:"partner_audio_booking_bh"`
 	PartnerVideoBookingAH *string `gorm:"column:partner_video_booking_ah" json:"partner_video_booking_ah"`
 	PartnerVideoBookingBH *string `gorm:"column:partner_video_booking_bh" json:"partner_video_booking_bh"`
+	RoundingFunction      *string `gorm:"column:rounding_function" json:"rounding_function"`
 	RoundBookings         *bool   `gorm:"column:round_bookings" json:"round_bookings"`
-	RoundingFunction      *bool   `gorm:"column:rounding_function" json:"rounding_function"`
 	SplitBookings         *bool   `gorm:"column:split_bookings" json:"split_bookings"`
 	SplitOnDemand         *bool   `gorm:"column:split_on_demand" json:"split_on_demand"`
 }

models/formatter.go

@@ -19,6 +19,7 @@ type BaseCall struct {
 	IvrData              *int
 	UtsEntries           int
 	InterpreterCount     int
+	Status               string
 }
 
 func (BaseCall) TableName() string {
@@ -61,27 +62,46 @@ func (InterpreterConnection) TableName() string {
 }
 
 type CallStat struct {
-	ClientConversationId string `gorm:"primaryKey;index"`
-	CallType             string `gorm:"index"`
-	ClientId             int    `gorm:"index"`
-	CustomerDnis         string
-	CustomerAni          string
-	SearchStartTime      time.Time
-	P1ConnectTime        time.Time `gorm:"index"`
-	P1DisconnectTime     time.Time `gorm:"index"`
-	BookingRequestNumber *int      `gorm:"index"`
-	UtsQueue             bool
-	InterpreterCount     int
-	InterpreterConnected bool
-	ClientDisconnected   bool
-	UtsDuration          int
-	UtsEntries           int
-	Status               string
-	FirstLanguageId      int
-	LastLanguageId       int
-	FirstInterpreter     string
+	ClientConversationId      string `gorm:"primaryKey;index"`
+	CallType                  string `gorm:"index"`
+	ClientId                  int    `gorm:"index"`
+	CustomerDnis              string
+	CustomerAni               string
+	ConversationStart         *time.Time `gorm:"index"`
+	ConversationEnd           *time.Time `gorm:"index"`
+	SearchStartTime           *time.Time
+	P1ConnectTime             time.Time `gorm:"index"`
+	P1DisconnectTime          time.Time `gorm:"index"`
+	BookingRequestNumber      *int      `gorm:"index"`
+	UtsQueue                  bool
+	InterpreterAcceptedCount  int
+	InterpreterAccepted       bool
+	InterpreterConnectedCount int
+	InterpreterConnected      bool
+	ClientDisconnected        bool
+	UtsDuration               int
+	UtsEntries                int
+	Status                    string
+	SubStatus                 string
+	FirstLanguageId           int
+	LastLanguageId            int
+	FirstInterpreter          string
 }
 
 func (CallStat) TableName() string {
 	return "gc_call_stats"
 }
+
+type Breakdown struct {
+	ClientConversationId      string    `gorm:"primaryKey;index"`
+	InterpreterConversationId string    `gorm:"index"`
+	Timestamp                 time.Time `gorm:"primaryKey;index"`
+	Task                      string    `gorm:"primaryKey"`
+	Duration                  int
+	Message                   string
+	Metadata                  *string `gorm:"type:json"`
+}
+
+func (Breakdown) TableName() string {
+	return "gc_call_breakdown"
+}

models/gencloud.go

@@ -72,6 +72,7 @@ type AnalyticsConversationWithoutAttributes struct {
 	DivisionIds                      []string `json:"divisionIds"`
 	Participants                     []struct {
 		ParticipantId     string `json:"participantId"`
+		UserId            string `json:"userId"`
 		ParticipantName   string `json:"participantName"`
 		Purpose           string `json:"purpose"`
 		ExternalContactId string `json:"externalContactId"`
@@ -183,3 +184,22 @@ type NotificationConversationWithAttributes struct {
 	SecurePause        bool             `json:"securePause"`
 	UtilizationLabelId string           `json:"utilizationLabelId"`
 }
+
+type UsersQuery struct {
+	Entities []GCUser `json:"entities"`
+	PageSize int      `json:"pageSize"`
+	Total    int      `json:"total"`
+}
+
+type GCUser struct {
+	Id            string `json:"id" gorm:"primaryKey"`
+	Name          string `json:"name"`
+	Email         string `json:"email"`
+	State         string `json:"state"`
+	Username      string `json:"username"`
+	AcdAutoAnswer bool   `json:"acdAutoAnswer"`
+}
+
+func (GCUser) TableName() string {
+	return "gc_users"
+}

models/participant.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type DBParticipant struct {
@@ -17,13 +19,24 @@ type DBParticipant struct {
 	Name                             *string `gorm:"index"`
 	Purpose                          *string `gorm:"index"`
 	QueueId                          *string
+	UserId                           *string
 	Wrapup                           *string `gorm:"type:json"`
 	WrapupExpected                   *bool
 	WrapupRequired                   *bool
 
 	Sessions []DBSession `gorm:"foreignKey:ParticipantId;references:Id"`
+	Calls    []DBCall    `gorm:"foreignKey:ParticipantId;references:Id"`
+	User     *GCUser     `gorm:"foreignKey:UserId;references:Id"`
 }
 
 func (DBParticipant) TableName() string {
 	return "gc_participants"
 }
+
+func (p *DBParticipant) BeforeSave(tx *gorm.DB) error {
+	// Convert empty string to nil
+	if p.UserId != nil && *p.UserId == "" {
+		p.UserId = nil
+	}
+	return nil
+}

models/processed.go

@@ -20,7 +20,7 @@ type DBClientProcessed struct {
 	// ---
 	BuggedCall  bool
 	Amended     bool
-	CreatedAt   time.Time
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
 	ModifiedAt  time.Time
 	CustomData  *string `gorm:"type:json"`
 	InternalUse *string `gorm:"type:json"`
@@ -85,7 +85,7 @@ type DBInterpreterProcessed struct {
 	// ---
 	BuggedCall  bool
 	Amended     bool
-	CreatedAt   time.Time
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
 	ModifiedAt  time.Time
 	CustomData  *string `gorm:"type:json"`
 	InternalUse *string `gorm:"type:json"`

util/extract.go

@@ -22,9 +22,9 @@ func ExtractWithoutAttributes(base models.AnalyticsConversationWithoutAttributes
 	var endTime *time.Time
 	parsedEndTime, err := time.Parse(time.RFC3339, base.ConversationEnd)
 	if err != nil {
-		startTime = nil
+		endTime = nil
 	} else {
-		startTime = &parsedEndTime
+		endTime = &parsedEndTime
 	}
 
 	divisionIdsBytes, err := json.Marshal(base.DivisionIds)
@@ -49,13 +49,14 @@ func ExtractWithoutAttributes(base models.AnalyticsConversationWithoutAttributes
 	for _, p := range base.Participants {
 
 		participant := models.DBParticipant{
-			ConnectedTime:     nil,
-			ConversationId:    base.ConversationId,
-			EndTime:           nil,
+			// ConnectedTime:     nil,
+			ConversationId: base.ConversationId,
+			// EndTime:           nil,
 			ExternalContactId: &p.ExternalContactId,
 			Id:                p.ParticipantId,
 			Name:              &p.ParticipantName,
 			Purpose:           &p.Purpose,
+			UserId:            &p.UserId,
 		}
 		participants = append(participants, participant)