Fix queries

Author: AchoArnold

api/pkg/repositories/gorm_message_repository.go

@@ -36,11 +36,15 @@ func NewGormMessageRepository(
 }
 
 // Index entities.Message between 2 parties
-func (repository *gormMessageRepository) Index(ctx context.Context, owner string, contact string, params IndexParams) (*[]entities.Message, error) {
+func (repository *gormMessageRepository) Index(ctx context.Context, userID entities.UserID, owner string, contact string, params IndexParams) (*[]entities.Message, error) {
 	ctx, span := repository.tracer.Start(ctx)
 	defer span.End()
 
-	query := repository.db.WithContext(ctx).Where("owner = ?", owner).Where("contact =  ?", contact)
+	query := repository.db.
+		WithContext(ctx).
+		Where("user_id = ?", userID).
+		Where("owner = ?", owner).
+		Where("contact =  ?", contact)
 	if len(params.Query) > 0 {
 		queryPattern := "%" + params.Query + "%"
 		query.Where("content ILIKE ?", queryPattern)
@@ -69,12 +73,12 @@ func (repository *gormMessageRepository) Store(ctx context.Context, message *ent
 }
 
 // Load an entities.Message by ID
-func (repository *gormMessageRepository) Load(ctx context.Context, messageID uuid.UUID) (*entities.Message, error) {
+func (repository *gormMessageRepository) Load(ctx context.Context, userID entities.UserID, messageID uuid.UUID) (*entities.Message, error) {
 	ctx, span := repository.tracer.Start(ctx)
 	defer span.End()
 
 	message := new(entities.Message)
-	err := repository.db.WithContext(ctx).First(message, messageID).Error
+	err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Where("id = ?", messageID).First(message).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		msg := fmt.Sprintf("message with ID [%s] does not exist", message.ID)
 		return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))
@@ -102,7 +106,7 @@ func (repository *gormMessageRepository) Update(ctx context.Context, message *en
 }
 
 // GetOutstanding fetches messages that still to be sent to the phone
-func (repository *gormMessageRepository) GetOutstanding(ctx context.Context, owner string, take int) (*[]entities.Message, error) {
+func (repository *gormMessageRepository) GetOutstanding(ctx context.Context, userID entities.UserID, owner string, take int) (*[]entities.Message, error) {
 	ctx, span := repository.tracer.Start(ctx)
 	defer span.End()
 
@@ -111,6 +115,7 @@ func (repository *gormMessageRepository) GetOutstanding(ctx context.Context, own
 		func(tx *gorm.DB) error {
 			return tx.WithContext(ctx).Model(messages).
 				Clauses(clause.Returning{}).
+				Where("user_id = ?", userID).
 				Where(
 					"id IN (?)",
 					tx.Model(&entities.Message{}).

api/pkg/repositories/gorm_message_thread_repository.go

@@ -70,7 +70,7 @@ func (repository *gormMessageThreadRepository) LoadByOwnerContact(ctx context.Co
 
 	err := repository.db.
 		WithContext(ctx).
-		Where("user = ?", userID).
+		Where("user_id = ?", userID).
 		Where("owner = ?", owner).
 		Where("contact = ?", contact).
 		First(thread).
@@ -97,8 +97,9 @@ func (repository *gormMessageThreadRepository) Load(ctx context.Context, userID
 
 	err := repository.db.
 		WithContext(ctx).
-		Where("user = ?", userID).
+		Where("user_id = ?", userID).
 		Where("id = ?", ID).
+		First(thread).
 		Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		msg := fmt.Sprintf("thread with id [%s] not found", ID)
@@ -120,7 +121,7 @@ func (repository *gormMessageThreadRepository) Index(ctx context.Context, userID
 
 	query := repository.db.
 		WithContext(ctx).
-		Where("user = ?", userID).
+		Where("user_id = ?", userID).
 		Where("owner = ?", owner)
 
 	if isArchived {

api/pkg/services/message_service.go

@@ -420,6 +420,7 @@ func (service *MessageService) StoreSentMessage(ctx context.Context, params Mess
 		ID:                params.ID,
 		Owner:             params.Owner,
 		Contact:           params.Contact,
+		UserID:            params.UserID,
 		Content:           params.Content,
 		Type:              entities.MessageTypeMobileTerminated,
 		Status:            entities.MessageStatusPending,

api/pkg/services/message_thread_service.go

@@ -114,6 +114,7 @@ func (service *MessageThreadService) createThread(ctx context.Context, params Me
 		ID:                 uuid.New(),
 		Owner:              params.Owner,
 		Contact:            params.Contact,
+		UserID:             params.UserID,
 		IsArchived:         false,
 		Color:              service.getColor(),
 		LastMessageContent: params.Content,

web/middleware/user.ts

@@ -8,7 +8,6 @@ export default async function (context: Context) {
 }
 
 const setUser = (context: Context): Promise<User | null> => {
-  console.log('running user')
   return new Promise((resolve, reject) => {
     const unsubscribe = (context.app.$fire.auth as Auth).onAuthStateChanged(
       async (user) => {

web/pages/threads/_id.vue

@@ -235,19 +235,10 @@ export default Vue.extend({
     if (!this.$store.getters.getAuthUser) {
       await this.$store.dispatch('setNextRoute', this.$route.path)
       await this.$router.push({ name: 'index' })
+      setTimeout(this.loadData, 2000)
       return
     }
-
-    await this.$store.dispatch('loadPhones')
-    await this.$store.dispatch('loadThreads')
-
-    if (!this.$store.getters.hasThreadId(this.$route.params.id)) {
-      await this.$router.push({ name: 'threads' })
-      return
-    }
-
-    await this.$store.dispatch('loadThreadMessages', this.$route.params.id)
-    this.scrollToElement()
+    await this.loadData()
   },
 
   methods: {
@@ -263,6 +254,19 @@ export default Vue.extend({
       ) // 5 minutes
     },
 
+    async loadData() {
+      await this.$store.dispatch('loadPhones')
+      await this.$store.dispatch('loadThreads')
+
+      if (!this.$store.getters.hasThreadId(this.$route.params.id)) {
+        await this.$router.push({ name: 'threads' })
+        return
+      }
+
+      await this.$store.dispatch('loadThreadMessages', this.$route.params.id)
+      this.scrollToElement()
+    },
+
     isMT(message: Message): boolean {
       return message.type === 'mobile-terminated'
     },

web/pages/threads/index.vue

@@ -32,10 +32,17 @@ export default {
     if (!this.$store.getters.getAuthUser) {
       await this.$store.dispatch('setNextRoute', this.$route.path)
       await this.$router.push({ name: 'index' })
+      setTimeout(this.loadData, 2000)
       return
     }
-    await this.$store.dispatch('loadThreads')
-    await this.$store.dispatch('loadPhones')
+    await this.loadData()
+  },
+
+  methods: {
+    async loadData() {
+      await this.$store.dispatch('loadThreads')
+      await this.$store.dispatch('loadPhones')
+    },
   },
 }
 </script>