Skip to content

Added the special type for member attributes #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joanreyero merged 3 commits into from
Jan 18, 2023
Merged

Added the special type for member attributes #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94c6c5e
Added the special type
Jan 18, 2023
80d752f
Filter out the special attributes
Jan 18, 2023
285da15
Format
Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/database/attributes/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ export enum AttributeType {
URL = 'url',
DATE = 'date',
MULTI_SELECT = 'multiSelect',
SPECIAL = 'special',
}
4 changes: 4 additions & 0 deletions backend/src/database/migrations/U1674038525__specialMemberAttribute.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ALTER TYPE public."memberAttributeSettings_type" RENAME TO "memberAttributeSettings_type_old";
CREATE TYPE "enum_memberAttributeSettings_type" AS ENUM ('boolean', 'number', 'email', 'string', 'url', 'date', 'multiSelect');
ALTER TABLE public."memberAttributeSettings" ALTER COLUMN type TYPE "memberAttributeSettings_type" USING type::text::"memberAttributeSettings_type";
DROP TYPE "memberAttributeSettings_type_old";
1 change: 1 addition & 0 deletions backend/src/database/migrations/V1674038525__specialMemberAttribute.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TYPE "enum_memberAttributeSettings_type" ADD VALUE 'special';
2 changes: 2 additions & 0 deletions backend/src/services/memberAttributeSettingsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ export default class MemberAttributeSettingsService {
return MemberAttributeSettingsService.isNumber(value)
case AttributeType.MULTI_SELECT:
return MemberAttributeSettingsService.isMultiSelect(value, inputs.options)
case AttributeType.SPECIAL:
return true
default:
return false
}
Expand Down
3 changes: 2 additions & 1 deletion backend/src/services/memberService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
} from '../serverless/utils/nodeWorkerSQS'
import { LoggingBase } from './loggingBase'
import { ExportableEntity } from '../serverless/microservices/nodejs/messageTypes'
import { AttributeType } from '../database/attributes/types'

export default class MemberService extends LoggingBase {
options: IServiceOptions
Expand Down Expand Up @@ -638,7 +639,7 @@ export default class MemberService extends LoggingBase {
async query(data, exportMode = false) {
const memberAttributeSettings = (
await MemberAttributeSettingsRepository.findAndCountAll({}, this.options)
).rows
).rows.filter((setting) => setting.type !== AttributeType.SPECIAL)
const advancedFilter = data.filter
const orderBy = data.orderBy
const limit = data.limit
Expand Down