patches v1.3.1 #59
1 changed files with 15 additions and 5 deletions
|
@ -5,6 +5,7 @@ import { membership } from "../../../entity/club/member/membership";
|
||||||
import DatabaseActionException from "../../../exceptions/databaseActionException";
|
import DatabaseActionException from "../../../exceptions/databaseActionException";
|
||||||
import InternalException from "../../../exceptions/internalException";
|
import InternalException from "../../../exceptions/internalException";
|
||||||
import { memberView } from "../../../views/memberView";
|
import { memberView } from "../../../views/memberView";
|
||||||
|
import { DB_TYPE } from "../../../env.defaults";
|
||||||
|
|
||||||
export default abstract class MemberService {
|
export default abstract class MemberService {
|
||||||
/**
|
/**
|
||||||
|
@ -158,13 +159,17 @@ export default abstract class MemberService {
|
||||||
"member.firstMembershipEntry",
|
"member.firstMembershipEntry",
|
||||||
"member.memberships",
|
"member.memberships",
|
||||||
"membership_first",
|
"membership_first",
|
||||||
"membership_first.memberId = member.id AND membership_first.start = (SELECT MIN(m.start) FROM membership m WHERE m.memberId = member.id)"
|
DB_TYPE == "postgres"
|
||||||
|
? 'membership_first.memberId = member.id AND membership_first.start = (SELECT MIN("m_first"."start") FROM "membership" "m_first" WHERE "m_first"."memberId" = "member"."id")'
|
||||||
|
: "membership_first.memberId = member.id AND membership_first.start = (SELECT MIN(m_first.start) FROM membership m_first WHERE m_first.memberId = member.id)"
|
||||||
)
|
)
|
||||||
.leftJoinAndMapOne(
|
.leftJoinAndMapOne(
|
||||||
"member.lastMembershipEntry",
|
"member.lastMembershipEntry",
|
||||||
"member.memberships",
|
"member.memberships",
|
||||||
"membership_last",
|
"membership_last",
|
||||||
"membership_last.memberId = member.id AND membership_last.start = (SELECT MAX(m.start) FROM membership m WHERE m.memberId = member.id)"
|
DB_TYPE == "postgres"
|
||||||
|
? 'membership_last.memberId = member.id AND membership_last.start = (SELECT MAX("m_last"."start") FROM "membership" "m_last" WHERE "m_last"."memberId" = "member"."id")'
|
||||||
|
: "membership_last.memberId = member.id AND membership_last.start = (SELECT MAX(m_last.start) FROM membership m_last WHERE m_last.memberId = member.id)"
|
||||||
)
|
)
|
||||||
.leftJoinAndSelect("membership_first.status", "status_first")
|
.leftJoinAndSelect("membership_first.status", "status_first")
|
||||||
.leftJoinAndSelect("membership_last.status", "status_last")
|
.leftJoinAndSelect("membership_last.status", "status_last")
|
||||||
|
@ -172,17 +177,22 @@ export default abstract class MemberService {
|
||||||
"member.preferredCommunication",
|
"member.preferredCommunication",
|
||||||
"member.communications",
|
"member.communications",
|
||||||
"preferredCommunication",
|
"preferredCommunication",
|
||||||
"preferredCommunication.preferred = 1"
|
"preferredCommunication.preferred = true"
|
||||||
)
|
)
|
||||||
.leftJoinAndSelect("preferredCommunication.type", "communicationtype_preferred")
|
.leftJoinAndSelect("preferredCommunication.type", "communicationtype_preferred")
|
||||||
.leftJoinAndMapOne(
|
.leftJoinAndMapOne(
|
||||||
"member.sendNewsletter",
|
"member.sendNewsletter",
|
||||||
"member.communications",
|
"member.communications",
|
||||||
"sendNewsletter",
|
"sendNewsletter",
|
||||||
"sendNewsletter.isSendNewsletter = 1"
|
"sendNewsletter.isSendNewsletter = true"
|
||||||
)
|
)
|
||||||
.leftJoinAndSelect("sendNewsletter.type", "communicationtype")
|
.leftJoinAndSelect("sendNewsletter.type", "communicationtype")
|
||||||
.leftJoinAndMapMany("member.smsAlarming", "member.communications", "smsAlarming", "smsAlarming.isSMSAlarming = 1")
|
.leftJoinAndMapMany(
|
||||||
|
"member.smsAlarming",
|
||||||
|
"member.communications",
|
||||||
|
"smsAlarming",
|
||||||
|
"smsAlarming.isSMSAlarming = true"
|
||||||
|
)
|
||||||
.leftJoinAndSelect("smsAlarming.type", "communicationtype_smsAlarming")
|
.leftJoinAndSelect("smsAlarming.type", "communicationtype_smsAlarming")
|
||||||
.leftJoinAndSelect("member.salutation", "salutation");
|
.leftJoinAndSelect("member.salutation", "salutation");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue