@stamhoofd/models 2.78.2 → 2.78.4

package/src/models/Member.ts

@@ -1,6 +1,6 @@
 import { column, Database, ManyToManyRelation, ManyToOneRelation, OneToManyRelation } from '@simonbackx/simple-database';
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import { MemberDetails, RegistrationWithMember as RegistrationWithMemberStruct, TinyMember } from '@stamhoofd/structures';
+import { MemberDetails, NationalRegisterNumberOptOut, RegistrationWithMember as RegistrationWithMemberStruct, TinyMember } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -353,29 +353,37 @@ export class Member extends QueryableModel {
     }
 
     async isSafeToMergeDuplicateWithoutSecurityCode() {
-        // If responsibilities: not safe
-        const responsibilities = await MemberResponsibilityRecord.where({ memberId: this.id }, { limit: 1 });
-        if (responsibilities.length > 0) {
+        if (this.details.recordAnswers.size > 0) {
             return false;
         }
 
-        if (this.details.recordAnswers.size > 0) {
+        if (this.details.parents.length > 0) {
             return false;
         }
 
-        if (this.details.reviewTimes.isReviewed('details')) {
+        if (this.details.emergencyContacts.length > 0) {
             return false;
         }
 
-        if (this.details.parents.length > 0) {
+        if (this.details.uitpasNumber) {
             return false;
         }
 
-        if (this.details.emergencyContacts.length > 0) {
+        if (this.details.nationalRegisterNumber !== null && this.details.nationalRegisterNumber !== NationalRegisterNumberOptOut) {
             return false;
         }
 
-        if (this.details.uitpasNumber) {
+        if (this.details.requiresFinancialSupport !== null) {
+            return false;
+        }
+
+        if (this.details.address || this.details.phone || this.details.email || this.details.alternativeEmails.length > 0 || this.details.unverifiedAddresses.length > 0 || this.details.unverifiedPhones.length > 0 || this.details.unverifiedEmails.length > 0) {
+            return false;
+        }
+
+        // If responsibilities: not safe
+        const responsibilities = await MemberResponsibilityRecord.where({ memberId: this.id }, { limit: 1 });
+        if (responsibilities.length > 0) {
             return false;
         }
 

package/src/models/Organization.ts

@@ -176,20 +176,6 @@ export class Organization extends QueryableModel {
         return this.fromRow(rows[0][this.table]);
     }
 
-    /**
-     * Get an Organization by looking at the host of a request
-     * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app
-     * + switch country if needed
-     */
-    static async getFromRequest(request: DecodedRequest<any, any, any>): Promise<Organization> {
-        const organization = await Organization.fromApiHost(request.host);
-
-        const i18n = I18n.fromRequest(request);
-        i18n.switchToLocale({ country: organization.address.country });
-
-        return organization;
-    }
-
     /**
      * Get an Organization by looking at the host of a request
      * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app