Merge pull request #35 from StreetSupport/feature/3013-create-organisation-listing-and-search-interface

3013 - Remove duplicated Has on site manager property

Author: o-seliuchenko

src/jobs/verificationJob.ts

@@ -22,7 +22,6 @@ export function startVerificationJob() {
 
       // Find all organisations with selected administrators
       const organisations = await Organisation.find({ 
-        'Administrators.IsSelected': true,
         // TODO: remove this after testing
         DocumentCreationDate: { $gte: new Date('2025-11-01') }
       });
@@ -39,23 +38,24 @@ export function startVerificationJob() {
 
           // Find selected administrator
           const selectedAdmin = org.Administrators.find(admin => admin.IsSelected);
+          const email = selectedAdmin?.Email || org.Email;
 
-          if (!selectedAdmin || !selectedAdmin.Email) {
+          if (!email) {
             continue;
           }
 
           // Check if exactly 90 days (send reminder)
           if (daysSinceUpdate === 90) {
-            console.log(`Reminder sent for: ${org.Name} (${selectedAdmin.Email})`);
+            console.log(`Reminder sent for: ${org.Name} (${email})`);
             const emailSent = await sendVerificationReminderEmail(
-              selectedAdmin.Email,
+              email,
               org.Name,
               daysSinceUpdate
             );
 
             if (emailSent) {
               remindersCount++;
-              console.log(`Reminder sent for: ${org.Name} (${selectedAdmin.Email})`);
+              console.log(`Reminder sent for: ${org.Name} (${email})`);
             } else {
               errors.push(`Failed to send reminder for ${org.Name}`);
             }
@@ -73,13 +73,13 @@ export function startVerificationJob() {
 
             // Send notification email
             const emailSent = await sendVerificationExpiredEmail(
-              selectedAdmin.Email,
+              email,
               org.Name
             );
 
             if (emailSent) {
               unverifiedCount++;
-              console.log(`Organisation unverified: ${org.Name} (${selectedAdmin.Email})`);
+              console.log(`Organisation unverified: ${org.Name} (${email})`);
               console.log(`  - Related services updated: ${totalUpdated}`);
             } else {
               errors.push(`Failed to send expiration email for ${org.Name}`);

src/models/accommodationModel.ts

@@ -244,12 +244,6 @@ const AccommodationSchema = new Schema<IAccommodation>({
     }
   },
   SupportProvidedInfo: {
-    // I don't know if we need this property because we use another field FeaturesWithDiscretionary.HasOnSiteManager on WEB
-    HasOnSiteManager: {
-      type: Number,
-      required: false,
-      enum: [DiscretionaryValue.No, DiscretionaryValue.Yes, DiscretionaryValue.DontKnowAsk]
-    },
     SupportOffered: {
       type: [String],
       required: false

src/schemas/accommodationSchema.ts

@@ -118,7 +118,6 @@ const ResidentCriteriaInfoSchema = z.object({
 });
 
 const SupportProvidedInfoSchema = z.object({
-  HasOnSiteManager: z.preprocess(preprocessNumber, DiscretionaryValueSchema.optional()),
   SupportOffered: z.preprocess(preprocessJSON, z.array(z.nativeEnum(SupportOfferedType)).optional()),
   SupportInfo: z.preprocess(preprocessNullableString, z.string().optional()),
 });

src/types/organisations/IAccommodation.ts

@@ -97,7 +97,6 @@ export interface IAccommodation {
     AcceptsBenefitsClaimants?: boolean;
   };
   SupportProvidedInfo: {
-    HasOnSiteManager?: number;
     SupportOffered?: string[];
     SupportInfo?: string;
   };