11706772151

Committed 06 Nov 2024 03:32PM UTC coverage: 43.398% (+0.03%) from 43.367%

Build # 11706772151

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9803 from hicommonwealth/tim/thread-user-fixes

Content Migration Fix + Avatar Url Fix

Run Details

983 of 2601 branches covered (37.79%)

Branch coverage included in aggregate %.

2 of 2 new or added lines in 1 file covered. (100.0%)

1 existing line in 1 file now uncovered.

2133 of 4579 relevant lines covered (46.58%)

22.4 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

84.62

/libs/model/src/models/user.ts

import { User, UserProfile } from '@hicommonwealth/schemas';
import Sequelize from 'sequelize';
import { z } from 'zod';
import { getRandomAvatar } from '../utils/defaultAvatar';
import type { AddressAttributes, AddressInstance } from './address';
import type { CommentSubscriptionAttributes } from './comment_subscriptions';
import type { CommunityAttributes, CommunityInstance } from './community';
import type { CommunityAlertAttributes } from './community_alerts';
import type { SubscriptionPreferenceAttributes } from './subscription_preference';
import type { ThreadSubscriptionAttributes } from './thread_subscriptions';
import type { ModelInstance } from './types';

export type EmailNotificationInterval = 'weekly' | 'never';

export type UserAttributes = z.infer<typeof User> & {
  // associations (see https://vivacitylabs.com/setup-typescript-sequelize/)
  selectedCommunity?: CommunityAttributes | CommunityAttributes['id'];
  Addresses?: AddressAttributes[] | AddressAttributes['id'][];
  Communities?: CommunityAttributes[] | CommunityAttributes['id'][];
  SubscriptionPreferences?: SubscriptionPreferenceAttributes;
  threadSubscriptions?: ThreadSubscriptionAttributes[];
  commentSubscriptions?: CommentSubscriptionAttributes[];
  communityAlerts?: CommunityAlertAttributes[];
};

// eslint-disable-next-line no-use-before-define
export type UserInstance = ModelInstance<UserAttributes> & {
  getSelectedCommunity: Sequelize.BelongsToGetAssociationMixin<CommunityInstance>;
  setSelectedCommunity: Sequelize.BelongsToSetAssociationMixin<
    CommunityInstance,
    CommunityInstance['id']
  >;

  hasAddresses: Sequelize.HasManyHasAssociationsMixin<
    AddressInstance,
    AddressInstance['id']
  >;
  getAddresses: Sequelize.HasManyGetAssociationsMixin<AddressInstance>;
  setAddresses: Sequelize.HasManySetAssociationsMixin<
    AddressInstance,
    AddressInstance['id']
  >;
};

export type UserModelStatic = Sequelize.ModelStatic<UserInstance>;

export default (sequelize: Sequelize.Sequelize): UserModelStatic =>
  <UserModelStatic>sequelize.define<UserInstance>(
    'User',
    {
      id: { type: Sequelize.INTEGER, autoIncrement: true, primaryKey: true },
      email: { type: Sequelize.STRING, allowNull: true },
      emailVerified: {
        type: Sequelize.BOOLEAN,
        allowNull: true,
      },
      emailNotificationInterval: {
        type: Sequelize.STRING,
        defaultValue: 'never',
        allowNull: false,
      },
      promotional_emails_enabled: { type: Sequelize.BOOLEAN, allowNull: true },
      is_welcome_onboard_flow_complete: {
        type: Sequelize.BOOLEAN,
        defaultValue: false,
        allowNull: false,
      },
      isAdmin: { type: Sequelize.BOOLEAN, defaultValue: false },
      disableRichText: {
        type: Sequelize.BOOLEAN,
        defaultValue: false,
        allowNull: false,
      },
      selected_community_id: { type: Sequelize.STRING, allowNull: true },
      profile: { type: Sequelize.JSONB, allowNull: false },
      xp_points: { type: Sequelize.INTEGER, defaultValue: 0, allowNull: true },
    },
    {
      timestamps: true,
      createdAt: 'created_at',
      updatedAt: 'updated_at',
      tableName: 'Users',
      underscored: false,
      indexes: [{ fields: ['email'], unique: true }],
      defaultScope: {
        attributes: {
          exclude: [
            'emailVerified',
            'emailNotificationInterval',
            'isAdmin',
            'created_at',
            'updated_at',
          ],
        },
      },
      scopes: {
        withPrivateData: {},
      },
      validate: {
        definedAvatarUrl() {
          if (
            this.profile &&
            !(this.profile as z.infer<typeof UserProfile>)?.avatar_url
          ) {
            throw new Error('profile.avatar_url must be defined');
          }
        },
      },
      hooks: {
        beforeValidate(instance: UserInstance) {
          if (instance.profile && !instance.profile.avatar_url) {
            instance.profile.avatar_url = getRandomAvatar();
          }
        },
      },
    },
  );

1	import { User, UserProfile } from '@hicommonwealth/schemas';
2	import Sequelize from 'sequelize';
3	import { z } from 'zod';
4	import { getRandomAvatar } from '../utils/defaultAvatar';
5	import type { AddressAttributes, AddressInstance } from './address';
6	import type { CommentSubscriptionAttributes } from './comment_subscriptions';
7	import type { CommunityAttributes, CommunityInstance } from './community';
8	import type { CommunityAlertAttributes } from './community_alerts';
9	import type { SubscriptionPreferenceAttributes } from './subscription_preference';
10	import type { ThreadSubscriptionAttributes } from './thread_subscriptions';
11	import type { ModelInstance } from './types';
12
13	export type EmailNotificationInterval = 'weekly' \| 'never';
14
15	export type UserAttributes = z.infer<typeof User> & {
16	// associations (see https://vivacitylabs.com/setup-typescript-sequelize/)
17	selectedCommunity?: CommunityAttributes \| CommunityAttributes['id'];
18	Addresses?: AddressAttributes[] \| AddressAttributes['id'][];
19	Communities?: CommunityAttributes[] \| CommunityAttributes['id'][];
20	SubscriptionPreferences?: SubscriptionPreferenceAttributes;
21	threadSubscriptions?: ThreadSubscriptionAttributes[];
22	commentSubscriptions?: CommentSubscriptionAttributes[];
23	communityAlerts?: CommunityAlertAttributes[];
24	};
25
26	// eslint-disable-next-line no-use-before-define
27	export type UserInstance = ModelInstance<UserAttributes> & {
28	getSelectedCommunity: Sequelize.BelongsToGetAssociationMixin<CommunityInstance>;
29	setSelectedCommunity: Sequelize.BelongsToSetAssociationMixin<
30	CommunityInstance,
31	CommunityInstance['id']
32	>;
33
34	hasAddresses: Sequelize.HasManyHasAssociationsMixin<
35	AddressInstance,
36	AddressInstance['id']
37	>;
38	getAddresses: Sequelize.HasManyGetAssociationsMixin<AddressInstance>;
39	setAddresses: Sequelize.HasManySetAssociationsMixin<
40	AddressInstance,
41	AddressInstance['id']
42	>;
43	};
44
45	export type UserModelStatic = Sequelize.ModelStatic<UserInstance>;
46
47	export default (sequelize: Sequelize.Sequelize): UserModelStatic =>
48	<UserModelStatic>sequelize.define<UserInstance>(	47✔
49	'User',
50	{
51	id: { type: Sequelize.INTEGER, autoIncrement: true, primaryKey: true },
52	email: { type: Sequelize.STRING, allowNull: true },
53	emailVerified: {
54	type: Sequelize.BOOLEAN,
55	allowNull: true,
56	},
57	emailNotificationInterval: {
58	type: Sequelize.STRING,
59	defaultValue: 'never',
60	allowNull: false,
61	},
62	promotional_emails_enabled: { type: Sequelize.BOOLEAN, allowNull: true },
63	is_welcome_onboard_flow_complete: {
64	type: Sequelize.BOOLEAN,
65	defaultValue: false,
66	allowNull: false,
67	},
68	isAdmin: { type: Sequelize.BOOLEAN, defaultValue: false },
69	disableRichText: {
70	type: Sequelize.BOOLEAN,
71	defaultValue: false,
72	allowNull: false,
73	},
74	selected_community_id: { type: Sequelize.STRING, allowNull: true },
75	profile: { type: Sequelize.JSONB, allowNull: false },
76	xp_points: { type: Sequelize.INTEGER, defaultValue: 0, allowNull: true },
77	},
78	{
79	timestamps: true,
80	createdAt: 'created_at',
81	updatedAt: 'updated_at',
82	tableName: 'Users',
83	underscored: false,
84	indexes: [{ fields: ['email'], unique: true }],
85	defaultScope: {
86	attributes: {
87	exclude: [
88	'emailVerified',
89	'emailNotificationInterval',
90	'isAdmin',
91	'created_at',
92	'updated_at',
93	],
94	},
95	},
96	scopes: {
97	withPrivateData: {},
98	},
99	validate: {
100	definedAvatarUrl() {
101	if (	33!
102	this.profile &&	66✔
103	!(this.profile as z.infer<typeof UserProfile>)?.avatar_url
104	) {
UNCOV 105	throw new Error('profile.avatar_url must be defined');	×
106	}
107	},
108	},
109	hooks: {
110	beforeValidate(instance: UserInstance) {
111	if (instance.profile && !instance.profile.avatar_url) {	33✔
112	instance.profile.avatar_url = getRandomAvatar();	7✔
113	}
114	},
115	},
116	},
117	);

hicommonwealth / commonwealth / 11706772151

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous