From d6603b4bf8e12864180119ad2e811def81987f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= Date: Tue, 1 Mar 2022 13:17:05 +0100 Subject: [PATCH] [MM-41611] Only check for userId when saving userTermsOfService (#19587) * Only check for userId when saving userTermsOfService * Add test Co-authored-by: Mattermod --- store/sqlstore/user_terms_of_service.go | 2 +- store/storetest/user_terms_of_service.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/store/sqlstore/user_terms_of_service.go b/store/sqlstore/user_terms_of_service.go index 0e8688113a..4187bd0bce 100644 --- a/store/sqlstore/user_terms_of_service.go +++ b/store/sqlstore/user_terms_of_service.go @@ -55,7 +55,7 @@ func (s SqlUserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfSe query := ` UPDATE UserTermsOfService SET UserId = :UserId, TermsOfServiceId = :TermsOfServiceId, CreateAt = :CreateAt - WHERE UserId = :UserId AND TermsOfServiceId = :TermsOfServiceId + WHERE UserId = :UserId ` result, err := s.GetMasterX().NamedExec(query, userTermsOfService) if err != nil { diff --git a/store/storetest/user_terms_of_service.go b/store/storetest/user_terms_of_service.go index fe88d72d65..d0ed6a6785 100644 --- a/store/storetest/user_terms_of_service.go +++ b/store/storetest/user_terms_of_service.go @@ -31,6 +31,18 @@ func testSaveUserTermsOfService(t *testing.T, ss store.Store) { assert.Equal(t, userTermsOfService.UserId, savedUserTermsOfService.UserId) assert.Equal(t, userTermsOfService.TermsOfServiceId, savedUserTermsOfService.TermsOfServiceId) assert.NotEmpty(t, savedUserTermsOfService.CreateAt) + + // Check we can save a new terms of service id (MM-41611) + newUserTermsOfService := &model.UserTermsOfService{ + UserId: userTermsOfService.UserId, + TermsOfServiceId: model.NewId(), + } + + savedUserTermsOfService, err = ss.UserTermsOfService().Save(newUserTermsOfService) + require.NoError(t, err) + assert.Equal(t, newUserTermsOfService.UserId, savedUserTermsOfService.UserId) + assert.Equal(t, newUserTermsOfService.TermsOfServiceId, savedUserTermsOfService.TermsOfServiceId) + assert.NotEmpty(t, savedUserTermsOfService.CreateAt) } func testGetByUserTermsOfService(t *testing.T, ss store.Store) {