[CHA-739] - Privacy settings by default true (#309)

* privacy setting by default true

* cleaning up

Author: totalimmersion

user.go

@@ -30,8 +30,8 @@ type ChannelMute struct {
 }
 
 type PrivacySettings struct {
-	TypingIndicators TypingIndicators `json:"typing_indicators,omitempty"`
-	ReadReceipts     ReadReceipts     `json:"read_receipts,omitempty"`
+	TypingIndicators *TypingIndicators `json:"typing_indicators,omitempty"`
+	ReadReceipts     *ReadReceipts     `json:"read_receipts,omitempty"`
 }
 
 type TypingIndicators struct {
@@ -50,9 +50,9 @@ type User struct {
 	Teams    []string `json:"teams,omitempty"`
 	Language string   `json:"language,omitempty"`
 
-	Online          bool            `json:"online,omitempty"`
-	Invisible       bool            `json:"invisible,omitempty"`
-	PrivacySettings PrivacySettings `json:"privacy_settings,omitempty"`
+	Online          bool             `json:"online,omitempty"`
+	Invisible       bool             `json:"invisible,omitempty"`
+	PrivacySettings *PrivacySettings `json:"privacy_settings,omitempty"`
 
 	CreatedAt  *time.Time `json:"created_at,omitempty"`
 	UpdatedAt  *time.Time `json:"updated_at,omitempty"`

user_test.go

@@ -221,38 +221,39 @@ func TestClient_UpdatePrivacySettings(t *testing.T) {
 	resp, err := c.UpsertUser(ctx, user)
 	require.NoError(t, err, "update users")
 
-	assert.Equal(t, resp.User.ID, user.ID)
-	assert.NotNil(t, resp.User.PrivacySettings)
-	assert.False(t, resp.User.PrivacySettings.TypingIndicators.Enabled)
-	assert.False(t, resp.User.PrivacySettings.ReadReceipts.Enabled)
+	require.Equal(t, resp.User.ID, user.ID)
+	require.Nil(t, resp.User.PrivacySettings)
 
 	user = resp.User
-	user.PrivacySettings = PrivacySettings{
-		TypingIndicators: TypingIndicators{
-			Enabled: true,
+	user.PrivacySettings = &PrivacySettings{
+		TypingIndicators: &TypingIndicators{
+			Enabled: false,
 		},
 	}
 	resp, err = c.UpsertUser(ctx, user)
 	require.NoError(t, err, "update users")
 
-	assert.Equal(t, resp.User.ID, user.ID)
-	assert.NotNil(t, resp.User.PrivacySettings)
-	assert.True(t, resp.User.PrivacySettings.TypingIndicators.Enabled)
-	assert.False(t, resp.User.PrivacySettings.ReadReceipts.Enabled)
+	require.Equal(t, resp.User.ID, user.ID)
+	require.NotNil(t, resp.User.PrivacySettings)
+	require.False(t, resp.User.PrivacySettings.TypingIndicators.Enabled)
+	require.Nil(t, resp.User.PrivacySettings.ReadReceipts)
 
 	user = resp.User
-	user.PrivacySettings = PrivacySettings{
-		ReadReceipts: ReadReceipts{
+	user.PrivacySettings = &PrivacySettings{
+		TypingIndicators: &TypingIndicators{
 			Enabled: true,
 		},
+		ReadReceipts: &ReadReceipts{
+			Enabled: false,
+		},
 	}
 	resp, err = c.UpsertUser(ctx, user)
 	require.NoError(t, err, "update users")
 
-	assert.Equal(t, resp.User.ID, user.ID)
-	assert.NotNil(t, resp.User.PrivacySettings)
-	assert.False(t, resp.User.PrivacySettings.TypingIndicators.Enabled)
-	assert.True(t, resp.User.PrivacySettings.ReadReceipts.Enabled)
+	require.Equal(t, resp.User.ID, user.ID)
+	require.NotNil(t, resp.User.PrivacySettings)
+	require.True(t, resp.User.PrivacySettings.TypingIndicators.Enabled)
+	require.False(t, resp.User.PrivacySettings.ReadReceipts.Enabled)
 }
 
 func TestClient_PartialUpdateUsers(t *testing.T) {
@@ -300,10 +301,8 @@ func TestClient_PartialUpdatePrivacySettings(t *testing.T) {
 	upsertResponse, err := c.UpsertUser(ctx, user)
 	require.NoError(t, err, "update users")
 
-	assert.Equal(t, upsertResponse.User.ID, user.ID)
-	assert.NotNil(t, upsertResponse.User.PrivacySettings)
-	assert.False(t, upsertResponse.User.PrivacySettings.TypingIndicators.Enabled)
-	assert.False(t, upsertResponse.User.PrivacySettings.ReadReceipts.Enabled)
+	require.Equal(t, upsertResponse.User.ID, user.ID)
+	require.Nil(t, upsertResponse.User.PrivacySettings)
 
 	update := PartialUserUpdate{
 		ID: user.ID,
@@ -319,8 +318,23 @@ func TestClient_PartialUpdatePrivacySettings(t *testing.T) {
 	partialUpdateResponse, err := c.PartialUpdateUsers(ctx, []PartialUserUpdate{update})
 	require.NoError(t, err, "partial update user")
 
-	assert.True(t, partialUpdateResponse.Users[user.ID].PrivacySettings.TypingIndicators.Enabled)
-	assert.False(t, partialUpdateResponse.Users[user.ID].PrivacySettings.ReadReceipts.Enabled)
+	require.True(t, partialUpdateResponse.Users[user.ID].PrivacySettings.TypingIndicators.Enabled)
+	require.Nil(t, partialUpdateResponse.Users[user.ID].PrivacySettings.ReadReceipts)
+
+	update = PartialUserUpdate{
+		ID: user.ID,
+		Set: map[string]interface{}{
+			"privacy_settings": map[string]interface{}{
+				"read_receipts": map[string]interface{}{
+					"enabled": false,
+				},
+			},
+		},
+	}
+	partialUpdateResponse, err = c.PartialUpdateUsers(ctx, []PartialUserUpdate{update})
+	require.NoError(t, err, "partial update user")
+	require.True(t, partialUpdateResponse.Users[user.ID].PrivacySettings.TypingIndicators.Enabled)
+	require.False(t, partialUpdateResponse.Users[user.ID].PrivacySettings.ReadReceipts.Enabled)
 }
 
 func ExampleClient_UpsertUser() {