diff --git a/Basic/Basic.csproj b/Basic/Basic.csproj
index 192c6db4..6f1b83bf 100644
--- a/Basic/Basic.csproj
+++ b/Basic/Basic.csproj
@@ -131,7 +131,7 @@
Code
-
+
True
diff --git a/Basic/Types/Swarm/BasicMembership.cs b/Basic/Types/Swarm/BasicParticipation.cs
similarity index 82%
rename from Basic/Types/Swarm/BasicMembership.cs
rename to Basic/Types/Swarm/BasicParticipation.cs
index bff72ef5..948a1051 100644
--- a/Basic/Types/Swarm/BasicMembership.cs
+++ b/Basic/Types/Swarm/BasicParticipation.cs
@@ -3,9 +3,9 @@ using Swarmops.Common.Interfaces;
namespace Swarmops.Basic.Types.Swarm
{
- public class BasicMembership : IHasIdentity
+ public class BasicParticipation : IHasIdentity
{
- public BasicMembership (int personId, int organizationId)
+ public BasicParticipation (int personId, int organizationId)
{
this.PersonId = personId;
this.OrganizationId = organizationId;
@@ -13,14 +13,14 @@ namespace Swarmops.Basic.Types.Swarm
this.DateTerminated = DateTime.MinValue;
}
- public BasicMembership (int personId, int organizationId, DateTime memberSince, DateTime expires)
+ public BasicParticipation (int personId, int organizationId, DateTime memberSince, DateTime expires)
: this (personId, organizationId)
{
this.MemberSince = memberSince;
this.Expires = expires;
}
- public BasicMembership (int membershipId, int personId, int organizationId, DateTime memberSince,
+ public BasicParticipation (int membershipId, int personId, int organizationId, DateTime memberSince,
DateTime expires, bool active, DateTime dateTerminated)
{
this.MembershipId = membershipId;
@@ -32,7 +32,7 @@ namespace Swarmops.Basic.Types.Swarm
this.DateTerminated = dateTerminated;
}
- public BasicMembership (BasicMembership original)
+ public BasicParticipation (BasicParticipation original)
: this (
original.MembershipId, original.PersonId, original.OrganizationId, original.MemberSince,
original.Expires, original.Active, original.DateTerminated)
diff --git a/Console/Console.cs b/Console/Console.cs
index fe4148d7..71102e72 100644
--- a/Console/Console.cs
+++ b/Console/Console.cs
@@ -288,9 +288,9 @@ namespace Swarmops
bool upMember = false;
bool ppMember = false;
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.Organization.Inherits(2))
{
@@ -346,9 +346,9 @@ namespace Swarmops
foreach (Organization org in orgTree)
{
- Memberships memberships = Memberships.ForOrganization (org, true);
+ Participations participations = Participations.ForOrganization (org, true);
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.MemberSince < date && (membership.Active || membership.DateTerminated > date))
{
@@ -389,9 +389,9 @@ namespace Swarmops
System.Diagnostics.Debugger.Break();
}
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId == 1 && membership.Active)
{
@@ -588,8 +588,8 @@ namespace Swarmops
{
bool activeMemberships = false;
- Memberships memberships = person.GetMemberships();
- foreach (Membership membership in memberships)
+ Participations participations = person.GetMemberships();
+ foreach (Participation membership in participations)
{
if (membership.Active)
{
@@ -709,9 +709,9 @@ namespace Swarmops
bool foundMismatch = false;
DateTime expiry = DateTime.MinValue;
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.Active)
{
@@ -739,7 +739,7 @@ namespace Swarmops
Console.WriteLine ("");
Console.WriteLine ("Found mismatch for " + person.Name + ":");
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
Console.WriteLine (" - " + membership.Organization.Name + ": expires " + membership.Expires.ToShortDateString());
if (expiry != membership.Expires)
@@ -911,23 +911,23 @@ namespace Swarmops
{
// For each membership in this suborg,§
- Memberships memberships = org.GetMemberships();
+ Participations participations = org.GetMemberships();
Console.WriteLine();
- Console.WriteLine(org.Name + ": " + memberships.Count + " members");
+ Console.WriteLine(org.Name + ": " + participations.Count + " members");
Console.WriteLine ("----------------------------------------------------------");
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
// Get the person for this membership and verify that he/she is also a member of PP
Person member = membership.Person;
- Memberships personMemberships = member.GetMemberships();
+ Participations personParticipations = member.GetMemberships();
bool ppMember = false;
- foreach (Membership testMembership in personMemberships)
+ foreach (Participation testMembership in personParticipations)
{
if (testMembership.OrganizationId == 1)
{
@@ -1397,9 +1397,9 @@ namespace Swarmops
Person person = Person.FromIdentity(personId);
writer.WriteLine(person.Name + " (#" + person.Identity.ToString() + ")");
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId == 1)
{
@@ -1562,9 +1562,9 @@ namespace Swarmops
{
Console.WriteLine(person.Name + " (#" + person.Identity.ToString() + ")");
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId == 1)
{
diff --git a/Database/Database-Memberships.cs b/Database/Database-Participation.cs
similarity index 82%
rename from Database/Database-Memberships.cs
rename to Database/Database-Participation.cs
index 5999234c..5e719ad7 100644
--- a/Database/Database-Memberships.cs
+++ b/Database/Database-Participation.cs
@@ -1,668 +1,668 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using Swarmops.Basic.Types;
-using Swarmops.Basic.Types.Swarm;
-using Swarmops.Common.Enums;
-using Swarmops.Common.Interfaces;
-
-namespace Swarmops.Database
-{
- public partial class SwarmDb
- {
- /*
- public int[] GetMembersForOrganization (int organizationId)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand(
- "SELECT PersonId From Memberships WHERE Active=1 AND OrganizationId=" +
- organizationId.ToString(), connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- return ReadIntegersAtZeroFromDataReader(reader);
- }
- }
- }*/
-
- private const string membershipFieldSequence =
- " Memberships.MembershipId, Memberships.PersonId, Memberships.OrganizationId, Memberships.Active, Memberships.Expires, " +
- // 0-4
- " Memberships.MemberSince, Memberships.DateTimeTerminated, Memberships.TerminatedAsInvalid " + // 5-7
- " FROM Memberships ";
-
- private const string membershipPaymentStatusFieldSequence =
- " MembershipPayments.MembershipId, MembershipPayments.MembershipPaymentStatusId, MembershipPayments.StatusDateTime " +
- " FROM MembershipPayments ";
-
- public int[] GetMembersForOrganizations (int[] organizationIds)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return new int[0];
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT PersonId From Memberships WHERE Active=1 AND OrganizationId IN (" +
- JoinIds (organizationIds) + ")", connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- return ReadIntegersAtZeroFromDataReader (reader);
- }
- }
- }
-
-
- public int[] GetMembersForOrganizationsAndGeographies (int[] organizationIds, int[] geographyIds)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return new int[0];
- }
-
- if (geographyIds == null || geographyIds.Length == 0)
- {
- return new int[0];
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand (
- "select DISTINCT People.PersonId from Memberships,People WHERE " +
- "People.PersonId=Memberships.PersonId AND Memberships.Active=1 AND " +
- "Memberships.OrganizationId IN (" + JoinIds (organizationIds) + ") AND " +
- "People.GeographyId IN (" + JoinIds (geographyIds) + ")", connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- return ReadIntegersAtZeroFromDataReader (reader);
- }
- }
- }
-
-
- public BasicMembership[] GetMemberships (params object[] conditions)
- {
- List result = new List();
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT " + membershipFieldSequence + ConstructWhereClause ("Memberships", conditions),
- connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- while (reader.Read())
- {
- result.Add (ReadMembershipFromDataReader (reader));
- }
-
- return result.ToArray();
- }
- }
- }
-
-
- public BasicMembership[] GetValidMembershipsForOrganizationAndPaymentStatus (int[] organizationIds,
- int paymentStatus)
- {
- string sqlCommand =
- @"SELECT " + membershipFieldSequence +
- @" LEFT OUTER JOIN
- MembershipPayments ON Memberships.MembershipId = MembershipPayments.MembershipId
- WHERE (Memberships.Active = 1)
- AND (coalesce(MembershipPayments.MembershipPaymentStatusId, 0) = " + paymentStatus + @")
- AND (Memberships.OrganizationId IN (" + JoinIds (organizationIds) + @"))
- AND (MembershipPayments.StatusDateTime =
- ( select MAX(StatusDateTime) from MembershipPayments M2 where Memberships.MembershipId = M2.MembershipId ) )";
-
- List result = new List();
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand (sqlCommand, connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- while (reader.Read())
- {
- result.Add (ReadMembershipFromDataReader (reader));
- }
-
- return result.ToArray();
- }
- }
- }
-
-
- public int GetMembershipCountForOrganizations (int[] organizationIds)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return 0;
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT Count(PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
- JoinIds (organizationIds) + ")", connection);
-
- return Convert.ToInt32 (command.ExecuteScalar());
- }
- }
-
- public int GetMembershipCountForOrganizationsSince (int[] organizationIds, DateTime sinceWhen)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return 0;
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT Count(PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
- JoinIds (organizationIds) + ") AND MemberSince > '" + sinceWhen.ToString ("yyyy-MM-dd HH:mm") +
- "'", connection);
-
- return Convert.ToInt32 (command.ExecuteScalar());
- }
- }
-
- public int GetMemberCountForOrganizations (int[] organizationIds)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return 0;
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT Count(DISTINCT PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
- JoinIds (organizationIds) + ")", connection);
-
- return Convert.ToInt32 (command.ExecuteScalar());
- }
- }
-
- public int GetMemberCountForOrganizationsAndGeographies (int[] organizationIds, int[] geographyIds)
- {
- if (organizationIds == null || organizationIds.Length == 0)
- {
- return 0;
- }
-
- if (geographyIds == null || geographyIds.Length == 0)
- {
- return 0;
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand (
- "select count(DISTINCT People.PersonId) from Memberships, People WHERE " +
- "People.PersonId=Memberships.PersonId AND Memberships.Active=1 AND " +
- "Memberships.OrganizationId IN (" + JoinIds (organizationIds) + ") AND " +
- "People.GeographyId IN (" + JoinIds (geographyIds) + ")", connection);
-
- return Convert.ToInt32 (command.ExecuteScalar());
- }
- }
-
-
- private static int[] ReadIntegersAtZeroFromDataReader (DbDataReader reader)
- {
- List result = new List();
-
- while (reader.Read())
- {
- result.Add (reader.GetInt32 (0));
- }
-
- return result.ToArray();
- }
-
-
- public Dictionary> GetMembershipsForPeople (int[] personIds)
- {
- return GetMembershipsForPeople (personIds, 0);
- }
-
-
- public Dictionary> GetMembershipsForPeople (int[] personIds, int gracePeriod)
- {
- Dictionary> result = new Dictionary>();
-
- if (personIds == null || personIds.Length == 0)
- {
- return result;
- }
-
- // Optimization: If more than 128 personIds, build a hash table, get _all_ memberships, and return
- // the matching ones logic wise. We've had _queries_ that exceed 64k text in length...
-
- if (personIds.Length > 128)
- {
- return GetMembershipsForPeopleOptimizedForLargeSets (personIds, gracePeriod);
- }
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- string commandString = "SELECT " + membershipFieldSequence + " WHERE "
- + (gracePeriod == 0
- ? "Active=1"
- : " (Expires > DATE_ADD(NOW(),INTERVAL -" + gracePeriod +
- " Day) AND (Expires < DATE_ADD(DateTimeTerminated,INTERVAL 1 Day) OR Active=1))")
- + " AND PersonId in (" + JoinIds (personIds) + ")";
-
- DbCommand command = GetDbCommand (commandString, connection);
- command.CommandTimeout = 30; // If 30s is too short, something needs optimization.
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- while (reader.Read())
- {
- BasicMembership membership = ReadMembershipFromDataReader (reader);
- int personId = membership.PersonId;
-
- if (!result.ContainsKey (personId))
- {
- result[personId] = new List();
- }
-
- result[personId].Add (ReadMembershipFromDataReader (reader));
- // Add to this person's list of memberships
- }
- }
- }
-
- return result;
- }
-
- private Dictionary> GetMembershipsForPeopleOptimizedForLargeSets (int[] personIds,
- int gracePeriod)
- {
- // This version is optimized for larger data sets. Rather than asking the database
- // for the correct set of people, ALL memberships are retrieved, and the filtering is
- // done in logic.
-
- Dictionary> result = new Dictionary>();
-
- // Build lookup
-
- Dictionary personIdLookup = new Dictionary();
-
- foreach (int personId in personIds)
- {
- personIdLookup[personId] = true;
- }
-
- // Get all memberships
-
- BasicMembership[] allMemberships = GetMemberships();
-
- foreach (BasicMembership membership in allMemberships)
- {
- if (membership.Active)
- {
- if (personIdLookup.ContainsKey (membership.PersonId))
- {
- if (!result.ContainsKey (membership.PersonId))
- {
- result[membership.PersonId] = new List();
- }
-
- result[membership.PersonId].Add (membership);
- }
- }
- else if (gracePeriod != 0)
- {
- //Within graceperiod?
- if (membership.Expires.AddDays (gracePeriod) > DateTime.Now &&
- membership.DateTerminated.AddDays (1) > membership.Expires)
- {
- if (personIdLookup.ContainsKey (membership.PersonId))
- {
- if (!result.ContainsKey (membership.PersonId))
- {
- result[membership.PersonId] = new List();
- }
-
- result[membership.PersonId].Add (membership);
- }
- }
- }
- }
-
-
- return result;
- }
-
-
- public BasicMembership GetActiveMembership (int personId, int organizationId)
- {
- if (personId == 0)
- {
- throw new ArgumentOutOfRangeException ("PersonId cannot be 0");
- }
-
- if (organizationId == 0)
- {
- throw new ArgumentOutOfRangeException ("OrganizationId cannot be 0");
- }
-
- List result = new List();
-
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT " + membershipFieldSequence + " WHERE Active=1 AND PersonId=" + personId +
- " AND OrganizationId=" + organizationId, connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- if (reader.Read())
- {
- return ReadMembershipFromDataReader (reader);
- }
-
- throw new ArgumentException ("No active membership for personid " + personId +
- ", organizationid " + organizationId);
- }
- }
- }
-
-
- public bool IsPersonMember (int personId, int organizationId)
- {
- try
- {
- GetActiveMembership (personId, organizationId);
- return true;
- }
- catch (ArgumentException)
- {
- return false;
- }
- }
-
-
- public BasicMembership GetMembership (int membershipId)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand ("SELECT " + membershipFieldSequence + " WHERE MembershipId=" + membershipId,
- connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- if (reader.Read())
- {
- return ReadMembershipFromDataReader (reader);
- }
-
- throw new ArgumentOutOfRangeException ("No such MembershipId: " + membershipId);
- }
- }
- }
-
-
- private static BasicMembership ReadMembershipFromDataReader (DbDataReader reader)
- {
- int membershipId = reader.GetInt32 (0);
- int personId = reader.GetInt32 (1);
- int organizationId = reader.GetInt32 (2);
- bool active = reader.GetBoolean (3);
- DateTime expires = reader.GetDateTime (4);
- DateTime memberSince = reader.GetDateTime (5);
- DateTime dateTerminated = reader.GetDateTime (6);
- // bool terminatedAsInvalid = reader.GetBoolean(7); Ignore this field for now
-
- return new BasicMembership (membershipId, personId, organizationId, memberSince, expires, active,
- dateTerminated);
- }
-
-
- public BasicMembershipPaymentStatus GetMembershipPaymentStatus (int membershipId)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT " + membershipPaymentStatusFieldSequence + " WHERE MembershipPayments.MembershipId=" +
- membershipId + " ORDER BY StatusDateTime DESC LIMIT 1", connection);
-
- using (DbDataReader reader = command.ExecuteReader())
- {
- if (reader.Read())
- {
- return ReadMembershipPaymentStatusFromDataReader (reader);
- }
-
- // No payment status -- return undefined
-
- return new BasicMembershipPaymentStatus (membershipId, MembershipPaymentStatus.Unknown,
- new DateTime (1900, 1, 1));
- }
- }
- }
-
- public Dictionary GetMembershipPaymentStatuses (int[] membershipIds)
- {
- Dictionary retVal = new Dictionary();
- if (membershipIds.Length == 0)
- return retVal;
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command =
- GetDbCommand (
- "SELECT " + membershipPaymentStatusFieldSequence + " WHERE MembershipPayments.MembershipId IN (" +
- JoinIds (membershipIds) + ") ORDER BY StatusDateTime ASC ", connection);
- using (DbDataReader reader = command.ExecuteReader())
- {
- while (reader.Read())
- {
- BasicMembershipPaymentStatus bms = ReadMembershipPaymentStatusFromDataReader (reader);
- retVal[bms.MembershipId] = ReadMembershipPaymentStatusFromDataReader (reader);
- }
- foreach (int i in membershipIds)
- {
- if (!retVal.ContainsKey (i))
- retVal[i] = new BasicMembershipPaymentStatus (i, MembershipPaymentStatus.Unknown,
- new DateTime (1900, 1, 1));
- }
- return retVal;
- }
- }
- }
-
-
- private BasicMembershipPaymentStatus ReadMembershipPaymentStatusFromDataReader (DbDataReader reader)
- {
- int membershipId = reader.GetInt32 (0);
- int membershipPaymentStatusId = reader.GetInt32 (1);
- DateTime statusDateTime = reader.GetDateTime (2);
-
- return new BasicMembershipPaymentStatus (membershipId, (MembershipPaymentStatus) membershipPaymentStatusId,
- statusDateTime);
- }
-
-
- public void SetMembershipExpires (int membershipId, DateTime newExpiry)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand ("SetMembershipExpires", connection);
- command.CommandType = CommandType.StoredProcedure;
-
- AddParameterWithName (command, "membershipId", membershipId);
- AddParameterWithName (command, "expires", newExpiry);
-
- command.ExecuteNonQuery();
- }
- }
-
- public void SetMembershipPaymentStatus (int membershipId, MembershipPaymentStatus paymentStatus,
- DateTime statusDateTime)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
- DbCommand command = GetDbCommand ("SetMembershipPaymentStatus", connection);
- command.CommandType = CommandType.StoredProcedure;
-
- AddParameterWithName (command, "membershipId", membershipId);
- AddParameterWithName (command, "paymentStatusId", (int) paymentStatus);
- AddParameterWithName (command, "statusDateTime", statusDateTime);
-
- command.ExecuteNonQuery();
- }
- }
-
-
- public int CreateMembership (int personId, int organizationId, DateTime expires)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand ("CreateMembership", connection);
- command.CommandType = CommandType.StoredProcedure;
-
- AddParameterWithName (command, "personId", personId);
- AddParameterWithName (command, "organizationId", organizationId);
- AddParameterWithName (command, "expires", expires);
-
- return Convert.ToInt32 (command.ExecuteScalar());
- }
- }
-
- public int ImportMembership (int personId, int organizationId, DateTime memberSince, DateTime expires)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand ("ImportMembership", connection);
- command.CommandType = CommandType.StoredProcedure;
-
- AddParameterWithName (command, "personId", personId);
- AddParameterWithName (command, "organizationId", organizationId);
- AddParameterWithName (command, "expires", expires);
- AddParameterWithName (command, "membersince", expires);
-
- int retval = Convert.ToInt32 (command.ExecuteScalar());
- return retval;
- }
- }
-
-
- public void TerminateMembership (int membershipId)
- {
- TerminateMembership (membershipId, false);
- }
-
-
- public void TerminateMembership (int membershipId, bool asInvalid)
- {
- using (DbConnection connection = GetMySqlDbConnection())
- {
- connection.Open();
-
- DbCommand command = GetDbCommand ("TerminateMembership", connection);
- command.CommandType = CommandType.StoredProcedure;
-
- AddParameterWithName (command, "membershipId", membershipId);
- AddParameterWithName (command, "terminatedAsInvalid", asInvalid);
-
- command.ExecuteNonQuery();
- }
- }
-
- public BasicMembership[] GetExpiringMemberships (IHasIdentity organization, DateTime expiry)
- {
- return GetExpiringMemberships (organization, expiry, expiry);
- }
-
- public BasicMembership[] GetExpiringMemberships (IHasIdentity organization, DateTime lowerBound,
- DateTime upperBound)
- {
- return GetExpiringMemberships (organization, lowerBound, upperBound, DatabaseCondition.ActiveTrue);
- }
-
- public BasicMembership[] GetExpiringMemberships (IHasIdentity organization, DateTime lowerBound,
- DateTime upperBound, DatabaseCondition condition)
- {
- // Since I don't trust SQL Server to make correct date comparisons, especially given
- // that the dates are passed in text in SQL, we get ALL the memberships and do
- // the comparison in code instead. This is a run-seldom function, anyway, and getting
- // some 50k records with four short unlinked fields isn't that expensive.
-
- BasicMembership[] memberships = GetMemberships (organization, condition);
-
- DateTime minimumDateTime = lowerBound.Date;
- DateTime maximumDateTime = upperBound.Date.AddDays (1);
-
- List result = new List();
-
- foreach (BasicMembership membership in memberships)
- {
- // It is important that the lower border is inclusive and the upper exclusive in this
- // comparison:
-
- if (membership.Expires >= minimumDateTime && membership.Expires < maximumDateTime)
- {
- result.Add (membership);
- }
- }
-
- return result.ToArray();
- }
- }
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using Swarmops.Basic.Types;
+using Swarmops.Basic.Types.Swarm;
+using Swarmops.Common.Enums;
+using Swarmops.Common.Interfaces;
+
+namespace Swarmops.Database
+{
+ public partial class SwarmDb
+ {
+ /*
+ public int[] GetMembersForOrganization (int organizationId)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand(
+ "SELECT PersonId From Memberships WHERE Active=1 AND OrganizationId=" +
+ organizationId.ToString(), connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ return ReadIntegersAtZeroFromDataReader(reader);
+ }
+ }
+ }*/
+
+ private const string membershipFieldSequence =
+ " Memberships.MembershipId, Memberships.PersonId, Memberships.OrganizationId, Memberships.Active, Memberships.Expires, " +
+ // 0-4
+ " Memberships.MemberSince, Memberships.DateTimeTerminated, Memberships.TerminatedAsInvalid " + // 5-7
+ " FROM Memberships ";
+
+ private const string membershipPaymentStatusFieldSequence =
+ " MembershipPayments.MembershipId, MembershipPayments.MembershipPaymentStatusId, MembershipPayments.StatusDateTime " +
+ " FROM MembershipPayments ";
+
+ public int[] GetMembersForOrganizations (int[] organizationIds)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return new int[0];
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT PersonId From Memberships WHERE Active=1 AND OrganizationId IN (" +
+ JoinIds (organizationIds) + ")", connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ return ReadIntegersAtZeroFromDataReader (reader);
+ }
+ }
+ }
+
+
+ public int[] GetParticipantsForOrganizationsAndGeographies (int[] organizationIds, int[] geographyIds)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return new int[0];
+ }
+
+ if (geographyIds == null || geographyIds.Length == 0)
+ {
+ return new int[0];
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand (
+ "select DISTINCT People.PersonId from Memberships,People WHERE " +
+ "People.PersonId=Memberships.PersonId AND Memberships.Active=1 AND " +
+ "Memberships.OrganizationId IN (" + JoinIds (organizationIds) + ") AND " +
+ "People.GeographyId IN (" + JoinIds (geographyIds) + ")", connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ return ReadIntegersAtZeroFromDataReader (reader);
+ }
+ }
+ }
+
+
+ public BasicParticipation[] GetParticipations (params object[] conditions)
+ {
+ List result = new List();
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT " + membershipFieldSequence + ConstructWhereClause ("Memberships", conditions),
+ connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ result.Add (ReadMembershipFromDataReader (reader));
+ }
+
+ return result.ToArray();
+ }
+ }
+ }
+
+
+ public BasicParticipation[] GetActiveParticipationsForOrganizationWithPaymentStatus (int[] organizationIds,
+ int paymentStatus)
+ {
+ string sqlCommand =
+ @"SELECT " + membershipFieldSequence +
+ @" LEFT OUTER JOIN
+ MembershipPayments ON Memberships.MembershipId = MembershipPayments.MembershipId
+ WHERE (Memberships.Active = 1)
+ AND (coalesce(MembershipPayments.MembershipPaymentStatusId, 0) = " + paymentStatus + @")
+ AND (Memberships.OrganizationId IN (" + JoinIds (organizationIds) + @"))
+ AND (MembershipPayments.StatusDateTime =
+ ( select MAX(StatusDateTime) from MembershipPayments M2 where Memberships.MembershipId = M2.MembershipId ) )";
+
+ List result = new List();
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand (sqlCommand, connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ result.Add (ReadMembershipFromDataReader (reader));
+ }
+
+ return result.ToArray();
+ }
+ }
+ }
+
+
+ public int GetParticipationCountForOrganizations (int[] organizationIds)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return 0;
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT Count(PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
+ JoinIds (organizationIds) + ")", connection);
+
+ return Convert.ToInt32 (command.ExecuteScalar());
+ }
+ }
+
+ public int GetParticipantCountForOrganizationsSince (int[] organizationIds, DateTime sinceWhen)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return 0;
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT Count(PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
+ JoinIds (organizationIds) + ") AND MemberSince > '" + sinceWhen.ToString ("yyyy-MM-dd HH:mm") +
+ "'", connection);
+
+ return Convert.ToInt32 (command.ExecuteScalar());
+ }
+ }
+
+ public int GetParticipantCountForOrganizations (int[] organizationIds)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return 0;
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT Count(DISTINCT PersonId) From Memberships WHERE Active=1 AND OrganizationId IN (" +
+ JoinIds (organizationIds) + ")", connection);
+
+ return Convert.ToInt32 (command.ExecuteScalar());
+ }
+ }
+
+ public int GetParticipantCountForOrganizationsAndGeographies (int[] organizationIds, int[] geographyIds)
+ {
+ if (organizationIds == null || organizationIds.Length == 0)
+ {
+ return 0;
+ }
+
+ if (geographyIds == null || geographyIds.Length == 0)
+ {
+ return 0;
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand (
+ "select count(DISTINCT People.PersonId) from Memberships, People WHERE " +
+ "People.PersonId=Memberships.PersonId AND Memberships.Active=1 AND " +
+ "Memberships.OrganizationId IN (" + JoinIds (organizationIds) + ") AND " +
+ "People.GeographyId IN (" + JoinIds (geographyIds) + ")", connection);
+
+ return Convert.ToInt32 (command.ExecuteScalar());
+ }
+ }
+
+
+ private static int[] ReadIntegersAtZeroFromDataReader (DbDataReader reader)
+ {
+ List result = new List();
+
+ while (reader.Read())
+ {
+ result.Add (reader.GetInt32 (0));
+ }
+
+ return result.ToArray();
+ }
+
+
+ public Dictionary> GetParticipationsForPeople (int[] personIds)
+ {
+ return GetParticipationsForPeople (personIds, 0);
+ }
+
+
+ public Dictionary> GetParticipationsForPeople (int[] personIds, int gracePeriod)
+ {
+ Dictionary> result = new Dictionary>();
+
+ if (personIds == null || personIds.Length == 0)
+ {
+ return result;
+ }
+
+ // Optimization: If more than 128 personIds, build a hash table, get _all_ memberships, and return
+ // the matching ones logic wise. We've had _queries_ that exceed 64k text in length...
+
+ if (personIds.Length > 128)
+ {
+ return GetParticipationsForPeopleOptimizedForLargeSets (personIds, gracePeriod);
+ }
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ string commandString = "SELECT " + membershipFieldSequence + " WHERE "
+ + (gracePeriod == 0
+ ? "Active=1"
+ : " (Expires > DATE_ADD(NOW(),INTERVAL -" + gracePeriod +
+ " Day) AND (Expires < DATE_ADD(DateTimeTerminated,INTERVAL 1 Day) OR Active=1))")
+ + " AND PersonId in (" + JoinIds (personIds) + ")";
+
+ DbCommand command = GetDbCommand (commandString, connection);
+ command.CommandTimeout = 30; // If 30s is too short, something needs optimization.
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ BasicParticipation participation = ReadMembershipFromDataReader (reader);
+ int personId = participation.PersonId;
+
+ if (!result.ContainsKey (personId))
+ {
+ result[personId] = new List();
+ }
+
+ result[personId].Add (ReadMembershipFromDataReader (reader));
+ // Add to this person's list of memberships
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private Dictionary> GetParticipationsForPeopleOptimizedForLargeSets (int[] personIds,
+ int gracePeriod)
+ {
+ // This version is optimized for larger data sets. Rather than asking the database
+ // for the correct set of people, ALL memberships are retrieved, and the filtering is
+ // done in logic.
+
+ Dictionary> result = new Dictionary>();
+
+ // Build lookup
+
+ Dictionary personIdLookup = new Dictionary();
+
+ foreach (int personId in personIds)
+ {
+ personIdLookup[personId] = true;
+ }
+
+ // Get all memberships
+
+ BasicParticipation[] allParticipations = GetParticipations();
+
+ foreach (BasicParticipation membership in allParticipations)
+ {
+ if (membership.Active)
+ {
+ if (personIdLookup.ContainsKey (membership.PersonId))
+ {
+ if (!result.ContainsKey (membership.PersonId))
+ {
+ result[membership.PersonId] = new List();
+ }
+
+ result[membership.PersonId].Add (membership);
+ }
+ }
+ else if (gracePeriod != 0)
+ {
+ //Within graceperiod?
+ if (membership.Expires.AddDays (gracePeriod) > DateTime.Now &&
+ membership.DateTerminated.AddDays (1) > membership.Expires)
+ {
+ if (personIdLookup.ContainsKey (membership.PersonId))
+ {
+ if (!result.ContainsKey (membership.PersonId))
+ {
+ result[membership.PersonId] = new List();
+ }
+
+ result[membership.PersonId].Add (membership);
+ }
+ }
+ }
+ }
+
+
+ return result;
+ }
+
+
+ public BasicParticipation GetActiveParticipation (int personId, int organizationId)
+ {
+ if (personId == 0)
+ {
+ throw new ArgumentOutOfRangeException ("PersonId cannot be 0");
+ }
+
+ if (organizationId == 0)
+ {
+ throw new ArgumentOutOfRangeException ("OrganizationId cannot be 0");
+ }
+
+ List result = new List();
+
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT " + membershipFieldSequence + " WHERE Active=1 AND PersonId=" + personId +
+ " AND OrganizationId=" + organizationId, connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ if (reader.Read())
+ {
+ return ReadMembershipFromDataReader (reader);
+ }
+
+ throw new ArgumentException ("No active membership for personid " + personId +
+ ", organizationid " + organizationId);
+ }
+ }
+ }
+
+
+ public bool IsPersonParticipant (int personId, int organizationId)
+ {
+ try
+ {
+ GetActiveParticipation (personId, organizationId);
+ return true;
+ }
+ catch (ArgumentException)
+ {
+ return false;
+ }
+ }
+
+
+ public BasicParticipation GetParticipation (int participationId)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand ("SELECT " + membershipFieldSequence + " WHERE MembershipId=" + participationId,
+ connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ if (reader.Read())
+ {
+ return ReadMembershipFromDataReader (reader);
+ }
+
+ throw new ArgumentOutOfRangeException ("No such MembershipId: " + participationId);
+ }
+ }
+ }
+
+
+ private static BasicParticipation ReadMembershipFromDataReader (DbDataReader reader)
+ {
+ int membershipId = reader.GetInt32 (0);
+ int personId = reader.GetInt32 (1);
+ int organizationId = reader.GetInt32 (2);
+ bool active = reader.GetBoolean (3);
+ DateTime expires = reader.GetDateTime (4);
+ DateTime memberSince = reader.GetDateTime (5);
+ DateTime dateTerminated = reader.GetDateTime (6);
+ // bool terminatedAsInvalid = reader.GetBoolean(7); Ignore this field for now
+
+ return new BasicParticipation (membershipId, personId, organizationId, memberSince, expires, active,
+ dateTerminated);
+ }
+
+
+ public BasicMembershipPaymentStatus GetMembershipPaymentStatus (int membershipId)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT " + membershipPaymentStatusFieldSequence + " WHERE MembershipPayments.MembershipId=" +
+ membershipId + " ORDER BY StatusDateTime DESC LIMIT 1", connection);
+
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ if (reader.Read())
+ {
+ return ReadMembershipPaymentStatusFromDataReader (reader);
+ }
+
+ // No payment status -- return undefined
+
+ return new BasicMembershipPaymentStatus (membershipId, MembershipPaymentStatus.Unknown,
+ new DateTime (1900, 1, 1));
+ }
+ }
+ }
+
+ public Dictionary GetMembershipPaymentStatuses (int[] membershipIds)
+ {
+ Dictionary retVal = new Dictionary();
+ if (membershipIds.Length == 0)
+ return retVal;
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command =
+ GetDbCommand (
+ "SELECT " + membershipPaymentStatusFieldSequence + " WHERE MembershipPayments.MembershipId IN (" +
+ JoinIds (membershipIds) + ") ORDER BY StatusDateTime ASC ", connection);
+ using (DbDataReader reader = command.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ BasicMembershipPaymentStatus bms = ReadMembershipPaymentStatusFromDataReader (reader);
+ retVal[bms.MembershipId] = ReadMembershipPaymentStatusFromDataReader (reader);
+ }
+ foreach (int i in membershipIds)
+ {
+ if (!retVal.ContainsKey (i))
+ retVal[i] = new BasicMembershipPaymentStatus (i, MembershipPaymentStatus.Unknown,
+ new DateTime (1900, 1, 1));
+ }
+ return retVal;
+ }
+ }
+ }
+
+
+ private BasicMembershipPaymentStatus ReadMembershipPaymentStatusFromDataReader (DbDataReader reader)
+ {
+ int membershipId = reader.GetInt32 (0);
+ int membershipPaymentStatusId = reader.GetInt32 (1);
+ DateTime statusDateTime = reader.GetDateTime (2);
+
+ return new BasicMembershipPaymentStatus (membershipId, (MembershipPaymentStatus) membershipPaymentStatusId,
+ statusDateTime);
+ }
+
+
+ public void SetParticipationExpires (int membershipId, DateTime newExpiry)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand ("SetMembershipExpires", connection);
+ command.CommandType = CommandType.StoredProcedure;
+
+ AddParameterWithName (command, "membershipId", membershipId);
+ AddParameterWithName (command, "expires", newExpiry);
+
+ command.ExecuteNonQuery();
+ }
+ }
+
+ public void SetMembershipPaymentStatus (int membershipId, MembershipPaymentStatus paymentStatus,
+ DateTime statusDateTime)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+ DbCommand command = GetDbCommand ("SetMembershipPaymentStatus", connection);
+ command.CommandType = CommandType.StoredProcedure;
+
+ AddParameterWithName (command, "membershipId", membershipId);
+ AddParameterWithName (command, "paymentStatusId", (int) paymentStatus);
+ AddParameterWithName (command, "statusDateTime", statusDateTime);
+
+ command.ExecuteNonQuery();
+ }
+ }
+
+
+ public int CreateParticipation (int personId, int organizationId, DateTime expires)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand ("CreateMembership", connection);
+ command.CommandType = CommandType.StoredProcedure;
+
+ AddParameterWithName (command, "personId", personId);
+ AddParameterWithName (command, "organizationId", organizationId);
+ AddParameterWithName (command, "expires", expires);
+
+ return Convert.ToInt32 (command.ExecuteScalar());
+ }
+ }
+
+ public int ImportParticipation (int personId, int organizationId, DateTime memberSince, DateTime expires)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand ("ImportMembership", connection);
+ command.CommandType = CommandType.StoredProcedure;
+
+ AddParameterWithName (command, "personId", personId);
+ AddParameterWithName (command, "organizationId", organizationId);
+ AddParameterWithName (command, "expires", expires);
+ AddParameterWithName (command, "membersince", expires);
+
+ int retval = Convert.ToInt32 (command.ExecuteScalar());
+ return retval;
+ }
+ }
+
+
+ public void TerminateParticipation (int membershipId)
+ {
+ TerminateParticipation (membershipId, false);
+ }
+
+
+ public void TerminateParticipation (int membershipId, bool asInvalid)
+ {
+ using (DbConnection connection = GetMySqlDbConnection())
+ {
+ connection.Open();
+
+ DbCommand command = GetDbCommand ("TerminateMembership", connection);
+ command.CommandType = CommandType.StoredProcedure;
+
+ AddParameterWithName (command, "membershipId", membershipId);
+ AddParameterWithName (command, "terminatedAsInvalid", asInvalid);
+
+ command.ExecuteNonQuery();
+ }
+ }
+
+ public BasicParticipation[] GetExpiringParticipations (IHasIdentity organization, DateTime expiry)
+ {
+ return GetExpiringParticipations (organization, expiry, expiry);
+ }
+
+ public BasicParticipation[] GetExpiringParticipations (IHasIdentity organization, DateTime lowerBound,
+ DateTime upperBound)
+ {
+ return GetExpiringParticipations (organization, lowerBound, upperBound, DatabaseCondition.ActiveTrue);
+ }
+
+ public BasicParticipation[] GetExpiringParticipations (IHasIdentity organization, DateTime lowerBound,
+ DateTime upperBound, DatabaseCondition condition)
+ {
+ // Since I don't trust SQL Server to make correct date comparisons, especially given
+ // that the dates are passed in text in SQL, we get ALL the memberships and do
+ // the comparison in code instead. This is a run-seldom function, anyway, and getting
+ // some 50k records with four short unlinked fields isn't that expensive.
+
+ BasicParticipation[] participations = GetParticipations (organization, condition);
+
+ DateTime minimumDateTime = lowerBound.Date;
+ DateTime maximumDateTime = upperBound.Date.AddDays (1);
+
+ List result = new List();
+
+ foreach (BasicParticipation participation in participations)
+ {
+ // It is important that the lower border is inclusive and the upper exclusive in this
+ // comparison:
+
+ if (participation.Expires >= minimumDateTime && participation.Expires < maximumDateTime)
+ {
+ result.Add (participation);
+ }
+ }
+
+ return result.ToArray();
+ }
+ }
}
\ No newline at end of file
diff --git a/Database/Database.csproj b/Database/Database.csproj
index d65ab9a9..64730017 100644
--- a/Database/Database.csproj
+++ b/Database/Database.csproj
@@ -90,7 +90,7 @@
-
+
diff --git a/Interface/DataObjects/ListPersonDataSource.cs b/Interface/DataObjects/ListPersonDataSource.cs
index fd93c2fc..c6f292bc 100644
--- a/Interface/DataObjects/ListPersonDataSource.cs
+++ b/Interface/DataObjects/ListPersonDataSource.cs
@@ -67,27 +67,27 @@ public class ListPersonDataSource
if (this.listedPersons != null)
{
People ppl = People.FromIdentities(this.listedPersons);
- Dictionary> membershipTable =
- Memberships.GetMembershipsForPeople(this.listedPersons, Membership.GracePeriod);
- Memberships membershipsToLoad = new Memberships();
+ Dictionary> membershipTable =
+ Participations.GetParticipationsForPeople(this.listedPersons, Participation.GracePeriod);
+ Participations participationsToLoad = new Participations();
foreach (Person p in ppl)
{
if (membershipTable.ContainsKey(p.Identity))
{
- foreach (BasicMembership bm in membershipTable[p.Identity])
+ foreach (BasicParticipation bm in membershipTable[p.Identity])
{
if (bm.OrganizationId == this.selectedOrgId)
{
- Membership ms = Membership.FromBasic(bm);
- membershipsToLoad.Add(ms);
+ Participation ms = Participation.FromBasic(bm);
+ participationsToLoad.Add(ms);
}
}
}
}
- Membership.LoadPaymentStatuses(membershipsToLoad);
+ Participation.LoadPaymentStatuses(participationsToLoad);
- Dictionary memberships = new Dictionary();
- foreach (Membership ms in membershipsToLoad)
+ Dictionary memberships = new Dictionary();
+ foreach (Participation ms in participationsToLoad)
{
memberships[ms.Identity] = ms;
}
@@ -97,11 +97,11 @@ public class ListPersonDataSource
ListPerson lp = new ListPerson(p);
if (membershipTable.ContainsKey(p.Identity))
{
- foreach (BasicMembership bm in membershipTable[p.Identity])
+ foreach (BasicParticipation bm in membershipTable[p.Identity])
{
if (bm.OrganizationId == this.selectedOrgId)
{
- Membership ms = memberships[bm.MembershipId];
+ Participation ms = memberships[bm.MembershipId];
lp.JoinedDate = ms.MemberSince;
lp.ExpiresDate = ms.Expires;
lp.MembershipId = ms.Identity;
diff --git a/Logic/Communications/OutboundComm.cs b/Logic/Communications/OutboundComm.cs
index 9d0f3f03..c65b6fcd 100644
--- a/Logic/Communications/OutboundComm.cs
+++ b/Logic/Communications/OutboundComm.cs
@@ -112,15 +112,15 @@ namespace Swarmops.Logic.Communications
}
- public static OutboundComm CreateMembershipLetter (ParticipantMailType mailType, Membership membership,
+ public static OutboundComm CreateMembershipLetter (ParticipantMailType mailType, Participation participation,
Person actingPerson)
{
- List recipients = People.FromSingle (membership.Person);
+ List recipients = People.FromSingle (participation.Person);
- OutboundComm comm = OutboundComm.Create (null, null, membership.Organization,
+ OutboundComm comm = OutboundComm.Create (null, null, participation.Organization,
CommResolverClass.Unknown, null,
CommTransmitterClass.CommsTransmitterMail,
- new PayloadEnvelope (new ParticipantMailPayload (mailType, membership, actingPerson)).ToXml(),
+ new PayloadEnvelope (new ParticipantMailPayload (mailType, participation, actingPerson)).ToXml(),
OutboundCommPriority.Low);
foreach (Person person in recipients)
diff --git a/Logic/Communications/Transmission/ParticipantMailPayload.cs b/Logic/Communications/Transmission/ParticipantMailPayload.cs
index ed754cd0..b91aaf54 100644
--- a/Logic/Communications/Transmission/ParticipantMailPayload.cs
+++ b/Logic/Communications/Transmission/ParticipantMailPayload.cs
@@ -25,7 +25,7 @@ namespace Swarmops.Logic.Communications.Transmission
public string BodyTemplate { get; set; }
- public ParticipantMailPayload (ParticipantMailType mailType, Membership membership, Person actingPerson)
+ public ParticipantMailPayload (ParticipantMailType mailType, Participation participation, Person actingPerson)
{
Strings = new SerializableDictionary();
@@ -33,10 +33,10 @@ namespace Swarmops.Logic.Communications.Transmission
{
case ParticipantMailType.MemberAddedWelcome:
Strings[MailPayloadString.ActingPerson] = actingPerson.Name;
- Strings[MailPayloadString.MembershipExpiry] = membership.Expires.ToLongDateString();
- Strings[MailPayloadString.OrganizationName] = membership.Organization.Name;
+ Strings[MailPayloadString.MembershipExpiry] = participation.Expires.ToLongDateString();
+ Strings[MailPayloadString.OrganizationName] = participation.Organization.Name;
Strings[MailPayloadString.Regularship] =
- Participant.Localized (membership.Organization.RegularLabel, TitleVariant.Ship);
+ Participant.Localized (participation.Organization.RegularLabel, TitleVariant.Ship);
BodyTemplate =
Resources.Logic_Communications_Transmission_DefaultCommTemplates
diff --git a/Logic/DataObjects/GeographyWithPeopleDataObject.cs b/Logic/DataObjects/GeographyWithPeopleDataObject.cs
index 1db8377e..35a7b901 100644
--- a/Logic/DataObjects/GeographyWithPeopleDataObject.cs
+++ b/Logic/DataObjects/GeographyWithPeopleDataObject.cs
@@ -31,7 +31,7 @@ namespace Swarmops.Logic.DataObjects
row.OrgId = orgId;
Geographies gTree = geo.ThisAndBelow();
int[] members = SwarmDb.GetDatabaseForReading()
- .GetMembersForOrganizationsAndGeographies (orgs.Identities, gTree.Identities);
+ .GetParticipantsForOrganizationsAndGeographies (orgs.Identities, gTree.Identities);
}
diff --git a/Logic/DataObjects/MembershipsDataObject.cs b/Logic/DataObjects/MembershipsDataObject.cs
index b78941e4..cb9b24f7 100644
--- a/Logic/DataObjects/MembershipsDataObject.cs
+++ b/Logic/DataObjects/MembershipsDataObject.cs
@@ -12,17 +12,17 @@ namespace Swarmops.Logic.DataObjects
#if !__MonoCS__
[DataObjectMethod (DataObjectMethodType.Select)]
#endif
- public static Membership[] Select (int personId)
+ public static Participation[] Select (int personId)
{
return
- Memberships.FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (Person.FromIdentity (personId)))
+ Participations.FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (Person.FromIdentity (personId)))
.ToArray();
}
#if !__MonoCS__
[DataObjectMethod (DataObjectMethodType.Select)]
#endif
- public static Membership[] Select (Person person)
+ public static Participation[] Select (Person person)
{
return Select (person.Identity);
}
@@ -30,9 +30,9 @@ namespace Swarmops.Logic.DataObjects
#if !__MonoCS__
[DataObjectMethod (DataObjectMethodType.Select)]
#endif
- public static Membership[] SelectStatic (Memberships memberships)
+ public static Participation[] SelectStatic (Participations participations)
{
- return memberships.ToArray();
+ return participations.ToArray();
}
}
}
\ No newline at end of file
diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj
index 4e2c8227..864c4585 100644
--- a/Logic/Logic.csproj
+++ b/Logic/Logic.csproj
@@ -364,10 +364,10 @@
-
+
-
+
diff --git a/Logic/Security/Authentication.cs b/Logic/Security/Authentication.cs
index 553d3b02..41a848e2 100644
--- a/Logic/Security/Authentication.cs
+++ b/Logic/Security/Authentication.cs
@@ -38,9 +38,9 @@ namespace Swarmops.Logic.Security
bool hasActiveMemberships = false;
- Memberships memberships = candidate.GetMemberships();
+ Participations participations = candidate.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.Active)
{
@@ -327,8 +327,8 @@ namespace Swarmops.Logic.Security
links += "\r\n\r\n";
links += "#" + p.PersonId;
links += " [Member of:";
- Memberships msList = p.GetMemberships();
- foreach (Membership ms in msList)
+ Participations msList = p.GetMemberships();
+ foreach (Participation ms in msList)
{
++membershipCount;
links += " (" + ms.Organization.Name + "," + ms.MemberSince.ToString ("yyyy-MM-dd") + ")";
@@ -500,7 +500,7 @@ namespace Swarmops.Logic.Security
string links = "";
foreach (Person p in candidatePeople)
{
- Memberships msList = p.GetMemberships();
+ Participations msList = p.GetMemberships();
if (msList.Count == 0 && p.IsActivist)
{
personIsActivist = true;
diff --git a/Logic/Security/Authority.cs b/Logic/Security/Authority.cs
index c4f88594..6ae85bf1 100644
--- a/Logic/Security/Authority.cs
+++ b/Logic/Security/Authority.cs
@@ -340,7 +340,7 @@ namespace Swarmops.Logic.Security
}
orgLookup[Organization.Identity] = true;
- Dictionary> membershipLookup = null;
+ Dictionary> membershipLookup = null;
if (HasSystemAccess(AccessType.Read) || HasAccess(new Access(Organization, aspect, AccessType.Read)))
{
@@ -348,7 +348,7 @@ namespace Swarmops.Logic.Security
// or org-wide read access (at least) to participant/personal data at current Organization
// Optimization: Get all memberships in advance, without instantiating logic objects
- membershipLookup = Memberships.GetMembershipsForPeople (rawList.Identities, 0);
+ membershipLookup = Participations.GetParticipationsForPeople (rawList.Identities, 0);
foreach (Person person in rawList)
{
@@ -358,9 +358,9 @@ namespace Swarmops.Logic.Security
if (membershipLookup.ContainsKey (person.Identity))
{
- List list = membershipLookup[person.Identity];
+ List list = membershipLookup[person.Identity];
- foreach (BasicMembership basicMembership in list)
+ foreach (BasicParticipation basicMembership in list)
{
if (orgLookup.ContainsKey (basicMembership.OrganizationId))
{
@@ -407,8 +407,8 @@ namespace Swarmops.Logic.Security
geoLookup[Position.GeographyId] = true;
// Optimization: Get all memberships in advance, without instantiating logic objects
- Dictionary> personLookup =
- Memberships.GetMembershipsForPeople(rawList.Identities, 0);
+ Dictionary> personLookup =
+ Participations.GetParticipationsForPeople(rawList.Identities, 0);
foreach (Person person in rawList)
{
@@ -422,9 +422,9 @@ namespace Swarmops.Logic.Security
{
// Geography hit. Test Membership / Organization.
- List list = personLookup[person.Identity];
+ List list = personLookup[person.Identity];
- foreach (BasicMembership basicMembership in list)
+ foreach (BasicParticipation basicMembership in list)
{
if (orgLookup.ContainsKey (basicMembership.OrganizationId))
{
diff --git a/Logic/Special/Sweden/SupportDatabase.cs b/Logic/Special/Sweden/SupportDatabase.cs
index 89db74af..297b90bf 100644
--- a/Logic/Special/Sweden/SupportDatabase.cs
+++ b/Logic/Special/Sweden/SupportDatabase.cs
@@ -449,9 +449,9 @@ namespace Swarmops.Logic.Special.Sweden
bool hasActiveMemberships = false;
- Memberships memberships = person.GetMemberships();
+ Participations participations = person.GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.Active)
{
diff --git a/Logic/Structure/GeographyStatistics.cs b/Logic/Structure/GeographyStatistics.cs
index 62018c27..259ebf2d 100644
--- a/Logic/Structure/GeographyStatistics.cs
+++ b/Logic/Structure/GeographyStatistics.cs
@@ -45,7 +45,7 @@ namespace Swarmops.Logic.Structure
{
People members =
People.FromMemberships (
- Memberships.ForOrganizations (Organization.FromIdentity (orgId).ThisAndBelow()));
+ Participations.ForOrganizations (Organization.FromIdentity (orgId).ThisAndBelow()));
foreach (Person person in members)
{
diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs
index bd1e2761..30e6d25c 100644
--- a/Logic/Structure/Organization.cs
+++ b/Logic/Structure/Organization.cs
@@ -437,7 +437,7 @@ namespace Swarmops.Logic.Structure
public int GetMemberCount()
{
- return Memberships.GetMemberCountForOrganization (this);
+ return Participations.GetParticipantCountForOrganization (this);
}
public NewsletterFeeds GetNewsletterFeeds()
@@ -893,12 +893,12 @@ namespace Swarmops.Logic.Structure
}
- public Memberships GetMemberships (bool includeTerminated)
+ public Participations GetMemberships (bool includeTerminated)
{
- return Memberships.ForOrganization (this, includeTerminated);
+ return Participations.ForOrganization (this, includeTerminated);
}
- public Memberships GetMemberships()
+ public Participations GetMemberships()
{
return GetMemberships (false);
}
diff --git a/Logic/Structure/Organizations.cs b/Logic/Structure/Organizations.cs
index f01ea567..6060c357 100644
--- a/Logic/Structure/Organizations.cs
+++ b/Logic/Structure/Organizations.cs
@@ -290,17 +290,17 @@ namespace Swarmops.Logic.Structure
public int GetMembershipCount()
{
- return Memberships.GetMemberCountForOrganizations (this);
+ return Participations.GetParticipantCountForOrganizations (this);
}
public int GetMemberCount()
{
- return SwarmDb.GetDatabaseForReading().GetMemberCountForOrganizations (Identities);
+ return SwarmDb.GetDatabaseForReading().GetParticipantCountForOrganizations (Identities);
}
public int GetMemberCountForGeographies (Geographies geographies)
{
- return SwarmDb.GetDatabaseForReading().GetMemberCountForOrganizationsAndGeographies (Identities,
+ return SwarmDb.GetDatabaseForReading().GetParticipantCountForOrganizationsAndGeographies (Identities,
geographies.Identities);
}
diff --git a/Logic/Support/LogEntries/PersonAddedLogEntry.cs b/Logic/Support/LogEntries/PersonAddedLogEntry.cs
index 97246ff8..572e4e85 100644
--- a/Logic/Support/LogEntries/PersonAddedLogEntry.cs
+++ b/Logic/Support/LogEntries/PersonAddedLogEntry.cs
@@ -16,10 +16,10 @@ namespace Swarmops.Logic.Support.LogEntries
// Do not call empty ctor directly. Intended for serialization only.
}
- public PersonAddedLogEntry (Membership membership, Person actingPerson)
+ public PersonAddedLogEntry (Participation participation, Person actingPerson)
{
DateTime = System.DateTime.UtcNow;
- MembershipId = membership.Identity;
+ MembershipId = participation.Identity;
ActingPersonId = actingPerson.Identity;
}
}
diff --git a/Logic/Swarm/MembershipEvents.cs b/Logic/Swarm/MembershipEvents.cs
index 73485025..7904b3b8 100644
--- a/Logic/Swarm/MembershipEvents.cs
+++ b/Logic/Swarm/MembershipEvents.cs
@@ -40,13 +40,13 @@ namespace Swarmops.Logic.Swarm
// Second phase, load all memberships
- BasicMembership[] allMemberships = SwarmDb.GetDatabaseForReading().GetMemberships();
+ BasicParticipation[] allParticipations = SwarmDb.GetDatabaseForReading().GetParticipations();
// Third phase - for every membership, generate one or two membership events
MembershipEvents result = new MembershipEvents();
- foreach (BasicMembership membership in allMemberships)
+ foreach (BasicParticipation membership in allParticipations)
{
int geographyId = 1;
int birthYear = 0;
diff --git a/Logic/Swarm/Memberships.cs b/Logic/Swarm/Memberships.cs
deleted file mode 100644
index 8343ee84..00000000
--- a/Logic/Swarm/Memberships.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Swarmops.Basic.Types;
-using Swarmops.Basic.Types.Swarm;
-using Swarmops.Database;
-using Swarmops.Logic.Security;
-using Swarmops.Logic.Structure;
-using Swarmops.Logic.Support;
-
-namespace Swarmops.Logic.Swarm
-{
- public class Memberships : List
- {
- public int[] Identities
- {
- get { return LogicServices.ObjectsToIdentifiers (ToArray()); }
- }
-
- public static Memberships FromArray (BasicMembership[] basicArray)
- {
- Memberships result = new Memberships();
-
- result.Capacity = basicArray.Length*11/10;
- foreach (BasicMembership basic in basicArray)
- {
- result.Add (Membership.FromBasic (basic));
- }
-
- return result;
- }
-
-
- /*
- public static BasicMembership[] GetMembershipsForPerson (int personId)
- {
- return LogicServices.GetDatabase().GetMembershipsForPerson(personId);
- }*/
-
- public static int GetMemberCountForOrganization (Organization organization)
- {
- return SwarmDb.GetDatabaseForReading().GetMembershipCountForOrganizations (new[] {organization.Identity});
- }
-
- public static int GetMemberCountForOrganizations (int[] organizationIds)
- {
- return SwarmDb.GetDatabaseForReading().GetMembershipCountForOrganizations (organizationIds);
- }
-
- public static int GetMemberCountForOrganizationSince (Organization org, DateTime sinceDateTime)
- {
- return GetMemberCountForOrganizationSince (org.Identity, sinceDateTime);
- }
-
- public static int GetMemberCountForOrganizationSince (int orgId, DateTime sinceDateTime)
- {
- return SwarmDb.GetDatabaseForReading()
- .GetMembershipCountForOrganizationsSince (new[] {orgId}, sinceDateTime);
- }
-
- public static int GetMemberCountForOrganizations (Organizations organizations)
- {
- List idArray = new List();
-
- foreach (Organization organization in organizations)
- {
- idArray.Add (organization.Identity);
- }
-
- return GetMemberCountForOrganizations (idArray.ToArray());
- }
- /*
- public Memberships RemoveToMatchAuthority (Geography personGeography, Authority authority)
- {
- return Authorization.FilterMembershipsToMatchAuthority (this, personGeography, authority);
- }*/
-
- public static Memberships ForOrganization (Organization organization, bool includeTerminated)
- {
- if (!includeTerminated)
- {
- return ForOrganization (organization);
- }
-
- return FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (organization));
- }
-
- public static Memberships ForOrganization (Organization organization)
- {
- return
- FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (organization, DatabaseCondition.ActiveTrue));
- }
-
- public static Memberships ForOrganizations (Organizations organizations, bool includeTerminated)
- {
- if (!includeTerminated)
- {
- return ForOrganizations (organizations);
- }
-
- return FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (organizations));
- }
-
- public static Memberships ForOrganizations (Organizations organizations)
- {
- return
- FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (organizations, DatabaseCondition.ActiveTrue));
- }
-
- public static Memberships GetExpiring (Organization organization, DateTime dateExpiry)
- {
- return GetExpiring (organization, dateExpiry, dateExpiry);
- }
-
- public static Memberships GetExpired (Organization organization)
- {
- return
- FromArray (SwarmDb.GetDatabaseForReading().GetExpiringMemberships (organization, DateTime.MinValue,
- DateTime.Now));
- }
-
- public static Memberships GetExpired (Organization organization, DateTime lowerBound, DateTime upperBound)
- {
- return
- FromArray (SwarmDb.GetDatabaseForReading()
- .GetExpiringMemberships (organization, lowerBound, upperBound, DatabaseCondition.None));
- }
-
- public static Memberships GetExpiring (Organization organization, DateTime lowerBound, DateTime upperBound)
- {
- return
- FromArray (SwarmDb.GetDatabaseForReading().GetExpiringMemberships (organization, lowerBound, upperBound));
- }
-
-
- public static Dictionary> GetMembershipsForPeople (int[] personIds, int gracePeriod)
- {
- return SwarmDb.GetDatabaseForReading().GetMembershipsForPeople (personIds, gracePeriod);
- }
- }
-}
\ No newline at end of file
diff --git a/Logic/Swarm/Membership.cs b/Logic/Swarm/Participation.cs
similarity index 81%
rename from Logic/Swarm/Membership.cs
rename to Logic/Swarm/Participation.cs
index e3d4931c..8d5d11e3 100644
--- a/Logic/Swarm/Membership.cs
+++ b/Logic/Swarm/Participation.cs
@@ -1,226 +1,226 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
-using Swarmops.Basic.Types;
-using Swarmops.Basic.Types.Swarm;
-using Swarmops.Common.Enums;
-using Swarmops.Database;
-using Swarmops.Logic.Security;
-using Swarmops.Logic.Structure;
-using Swarmops.Logic.Support;
-
-namespace Swarmops.Logic.Swarm
-{
- public class Membership : BasicMembership
- {
- public static readonly int GracePeriod = 28;
- private Organization organization;
- private BasicMembershipPaymentStatus paymentStatus;
- private Person person;
-
- private Membership (BasicMembership basic)
- : base (basic)
- {
- }
-
- public Person Person
- {
- get
- {
- if (this.person == null)
- {
- this.person = Person.FromIdentity (base.PersonId);
- }
-
- return this.person;
- }
- }
-
- public Organization Organization
- {
- get
- {
- if (this.organization == null)
- {
- this.organization = Organization.FromIdentity (base.OrganizationId);
- }
-
- return this.organization;
- }
- }
-
- public new DateTime Expires
- {
- get { return base.Expires; }
- set
- {
- if (base.Expires != value)
- {
- if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1))
- {
- ChurnData.LogRetention (PersonId, OrganizationId, base.Expires);
- }
- SwarmDb.GetDatabaseForWriting().SetMembershipExpires (Identity, value);
- base.Expires = value;
- }
- }
- }
-
- public MembershipPaymentStatus PaymentStatus
- {
- get
- {
- LoadPaymentStatus();
- return this.paymentStatus.Status;
- }
- private set
- {
- throw new InvalidOperationException (
- "It is not allowed to set PaymentStatus separately. Use SetPaymentStatus() method.");
-
- // Rick: Isn't it better to not have a setter at all and get the error compile-time rather than run-time?
- }
- }
-
-
- public DateTime PaymentStatusDate
- {
- get
- {
- LoadPaymentStatus();
- return this.paymentStatus.StatusDateTime;
- }
- private set
- {
- throw new InvalidOperationException (
- "It is not allowed to set PaymentStatusDate separately. Use SetPaymentStatus() method");
-
- // Rick: Isn't it better to not have a setter at all and get the error compile-time rather than run-time?
- }
- }
-
- public void SetPaymentStatus (MembershipPaymentStatus status, DateTime dateTime)
- {
- SwarmDb.GetDatabaseForWriting().SetMembershipPaymentStatus (Identity, status, dateTime);
- LoadPaymentStatus();
- this.paymentStatus.Status = status;
- this.paymentStatus.StatusDateTime = dateTime;
- }
-
- private void LoadPaymentStatus()
- {
- if (this.paymentStatus == null)
- {
- this.paymentStatus = SwarmDb.GetDatabaseForReading().GetMembershipPaymentStatus (Identity);
- }
- }
-
-
- //Optimization metod, loadMultiple in one call
- public static void LoadPaymentStatuses (Memberships mss)
- {
- Dictionary statuses =
- SwarmDb.GetDatabaseForReading().GetMembershipPaymentStatuses (mss.Identities);
- foreach (Membership ms in mss)
- {
- if (ms.paymentStatus == null && statuses.ContainsKey (ms.Identity))
- {
- ms.paymentStatus = statuses[ms.Identity];
- }
- }
- }
-
-
- public static Membership FromBasic (BasicMembership basic)
- {
- return new Membership (basic);
- }
-
- public static Membership FromIdentity (int membershipId)
- {
- return FromBasic (SwarmDb.GetDatabaseForReading().GetMembership (membershipId));
- }
-
- public static Membership FromIdentityAggressive (int membershipId)
- {
- return FromBasic (SwarmDb.GetDatabaseForWriting().GetMembership (membershipId));
- }
-
- public static Membership FromPersonAndOrganization (int personId, int organizationId)
- {
- return FromBasic (SwarmDb.GetDatabaseForReading().GetActiveMembership (personId, organizationId));
- }
-
- public static Membership Create (int personId, int organizationId, DateTime expires)
- {
- int membershipId = SwarmDb.GetDatabaseForWriting().CreateMembership (personId, organizationId, expires);
-
- return FromIdentityAggressive (membershipId);
- }
-
- public static Membership Create (Person person, Organization organization, DateTime expires)
- {
- return Create (person.Identity, organization.Identity, expires);
- }
-
- public static Membership Import (Person person, Organization organization, DateTime memberSince,
- DateTime expires)
- {
- return
- FromIdentity (SwarmDb.GetDatabaseForWriting()
- .ImportMembership (person.Identity, organization.Identity, memberSince,
- expires));
- }
-
-
- //public void Terminate ()
- //{
- // Terminate(EventSource.Unknown);
- //}
-
-
- public void Terminate (EventSource eventSource, Person actingPerson, string description)
- {
- if (base.Active)
- {
-
- // REMOVED: everything Roles related; being phased out
-
-
- PWLog.Write (actingPerson.Identity, PWLogItem.Person, Person.Identity, PWLogAction.MemberLost,
- eventSource + ":" + description, string.Empty);
- PWEvents.CreateEvent (EventSource.PirateWeb, EventType.LostMember, actingPerson.Identity, OrganizationId, Person.GeographyId,
- Person.Identity, 0, OrganizationId.ToString());
-
-
- //Added LogChurn here to make SURE they always are logged with the membership.
- if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1))
- {
- ChurnData.LogChurn (PersonId, OrganizationId);
- }
- SwarmDb.GetDatabaseForWriting().TerminateMembership (Identity);
- base.Active = false;
- base.DateTerminated = DateTime.Now;
-
- // Remove all newsletter subscriptions once the membership is terminated (to make sure default is now off and only turn off explicitly turned-on subscriptions)
-
- // HACK HACK HACK: uses feed IDs in an extremely ugly way to loop 1-9. Should use NewsletterFeeds.ForOrganization() once support for newsletters in different orgs are established.
-
- for (int newsletterFeedId = 1; newsletterFeedId < 10; newsletterFeedId++)
- {
- try
- {
- if (this.person.IsSubscribing (newsletterFeedId))
- {
- this.person.SetSubscription (newsletterFeedId, false);
- }
- }
- catch (Exception)
- {
- // ignore nonexisting newsletter feeds -- this is a hack anyway
- }
- }
- }
- }
- }
+using System;
+using System.Collections.Generic;
+using System.Web;
+using Swarmops.Basic.Types;
+using Swarmops.Basic.Types.Swarm;
+using Swarmops.Common.Enums;
+using Swarmops.Database;
+using Swarmops.Logic.Security;
+using Swarmops.Logic.Structure;
+using Swarmops.Logic.Support;
+
+namespace Swarmops.Logic.Swarm
+{
+ public class Participation : BasicParticipation
+ {
+ public static readonly int GracePeriod = 28;
+ private Organization organization;
+ private BasicMembershipPaymentStatus paymentStatus;
+ private Person person;
+
+ private Participation (BasicParticipation basic)
+ : base (basic)
+ {
+ }
+
+ public Person Person
+ {
+ get
+ {
+ if (this.person == null)
+ {
+ this.person = Person.FromIdentity (base.PersonId);
+ }
+
+ return this.person;
+ }
+ }
+
+ public Organization Organization
+ {
+ get
+ {
+ if (this.organization == null)
+ {
+ this.organization = Organization.FromIdentity (base.OrganizationId);
+ }
+
+ return this.organization;
+ }
+ }
+
+ public new DateTime Expires
+ {
+ get { return base.Expires; }
+ set
+ {
+ if (base.Expires != value)
+ {
+ if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1))
+ {
+ ChurnData.LogRetention (PersonId, OrganizationId, base.Expires);
+ }
+ SwarmDb.GetDatabaseForWriting().SetParticipationExpires (Identity, value);
+ base.Expires = value;
+ }
+ }
+ }
+
+ public MembershipPaymentStatus PaymentStatus
+ {
+ get
+ {
+ LoadPaymentStatus();
+ return this.paymentStatus.Status;
+ }
+ private set
+ {
+ throw new InvalidOperationException (
+ "It is not allowed to set PaymentStatus separately. Use SetPaymentStatus() method.");
+
+ // Rick: Isn't it better to not have a setter at all and get the error compile-time rather than run-time?
+ }
+ }
+
+
+ public DateTime PaymentStatusDate
+ {
+ get
+ {
+ LoadPaymentStatus();
+ return this.paymentStatus.StatusDateTime;
+ }
+ private set
+ {
+ throw new InvalidOperationException (
+ "It is not allowed to set PaymentStatusDate separately. Use SetPaymentStatus() method");
+
+ // Rick: Isn't it better to not have a setter at all and get the error compile-time rather than run-time?
+ }
+ }
+
+ public void SetPaymentStatus (MembershipPaymentStatus status, DateTime dateTime)
+ {
+ SwarmDb.GetDatabaseForWriting().SetMembershipPaymentStatus (Identity, status, dateTime);
+ LoadPaymentStatus();
+ this.paymentStatus.Status = status;
+ this.paymentStatus.StatusDateTime = dateTime;
+ }
+
+ private void LoadPaymentStatus()
+ {
+ if (this.paymentStatus == null)
+ {
+ this.paymentStatus = SwarmDb.GetDatabaseForReading().GetMembershipPaymentStatus (Identity);
+ }
+ }
+
+
+ //Optimization metod, loadMultiple in one call
+ public static void LoadPaymentStatuses (Participations mss)
+ {
+ Dictionary statuses =
+ SwarmDb.GetDatabaseForReading().GetMembershipPaymentStatuses (mss.Identities);
+ foreach (Participation ms in mss)
+ {
+ if (ms.paymentStatus == null && statuses.ContainsKey (ms.Identity))
+ {
+ ms.paymentStatus = statuses[ms.Identity];
+ }
+ }
+ }
+
+
+ public static Participation FromBasic (BasicParticipation basic)
+ {
+ return new Participation (basic);
+ }
+
+ public static Participation FromIdentity (int membershipId)
+ {
+ return FromBasic (SwarmDb.GetDatabaseForReading().GetParticipation (membershipId));
+ }
+
+ public static Participation FromIdentityAggressive (int membershipId)
+ {
+ return FromBasic (SwarmDb.GetDatabaseForWriting().GetParticipation (membershipId));
+ }
+
+ public static Participation FromPersonAndOrganization (int personId, int organizationId)
+ {
+ return FromBasic (SwarmDb.GetDatabaseForReading().GetActiveParticipation (personId, organizationId));
+ }
+
+ public static Participation Create (int personId, int organizationId, DateTime expires)
+ {
+ int membershipId = SwarmDb.GetDatabaseForWriting().CreateParticipation (personId, organizationId, expires);
+
+ return FromIdentityAggressive (membershipId);
+ }
+
+ public static Participation Create (Person person, Organization organization, DateTime expires)
+ {
+ return Create (person.Identity, organization.Identity, expires);
+ }
+
+ public static Participation Import (Person person, Organization organization, DateTime memberSince,
+ DateTime expires)
+ {
+ return
+ FromIdentity (SwarmDb.GetDatabaseForWriting()
+ .ImportParticipation (person.Identity, organization.Identity, memberSince,
+ expires));
+ }
+
+
+ //public void Terminate ()
+ //{
+ // Terminate(EventSource.Unknown);
+ //}
+
+
+ public void Terminate (EventSource eventSource, Person actingPerson, string description)
+ {
+ if (base.Active)
+ {
+
+ // REMOVED: everything Roles related; being phased out
+
+
+ PWLog.Write (actingPerson.Identity, PWLogItem.Person, Person.Identity, PWLogAction.MemberLost,
+ eventSource + ":" + description, string.Empty);
+ PWEvents.CreateEvent (EventSource.PirateWeb, EventType.LostMember, actingPerson.Identity, OrganizationId, Person.GeographyId,
+ Person.Identity, 0, OrganizationId.ToString());
+
+
+ //Added LogChurn here to make SURE they always are logged with the membership.
+ if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1))
+ {
+ ChurnData.LogChurn (PersonId, OrganizationId);
+ }
+ SwarmDb.GetDatabaseForWriting().TerminateParticipation (Identity);
+ base.Active = false;
+ base.DateTerminated = DateTime.Now;
+
+ // Remove all newsletter subscriptions once the membership is terminated (to make sure default is now off and only turn off explicitly turned-on subscriptions)
+
+ // HACK HACK HACK: uses feed IDs in an extremely ugly way to loop 1-9. Should use NewsletterFeeds.ForOrganization() once support for newsletters in different orgs are established.
+
+ for (int newsletterFeedId = 1; newsletterFeedId < 10; newsletterFeedId++)
+ {
+ try
+ {
+ if (this.person.IsSubscribing (newsletterFeedId))
+ {
+ this.person.SetSubscription (newsletterFeedId, false);
+ }
+ }
+ catch (Exception)
+ {
+ // ignore nonexisting newsletter feeds -- this is a hack anyway
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Logic/Swarm/Participations.cs b/Logic/Swarm/Participations.cs
new file mode 100644
index 00000000..47de7dc3
--- /dev/null
+++ b/Logic/Swarm/Participations.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using Swarmops.Basic.Types;
+using Swarmops.Basic.Types.Swarm;
+using Swarmops.Database;
+using Swarmops.Logic.Security;
+using Swarmops.Logic.Structure;
+using Swarmops.Logic.Support;
+
+namespace Swarmops.Logic.Swarm
+{
+ public class Participations : PluralBase
+ {
+
+ public static int GetParticipantCountForOrganization (Organization organization)
+ {
+ return SwarmDb.GetDatabaseForReading().GetParticipantCountForOrganizations (new[] {organization.Identity});
+ }
+
+ public static int GetParticipantCountForOrganizations (int[] organizationIds)
+ {
+ return SwarmDb.GetDatabaseForReading().GetParticipantCountForOrganizations (organizationIds);
+ }
+
+ public static int GetParticipantCountForOrganizationSince (Organization org, DateTime sinceDateTime)
+ {
+ return GetParticipantCountForOrganizationSince (org.Identity, sinceDateTime);
+ }
+
+ public static int GetParticipantCountForOrganizationSince (int orgId, DateTime sinceDateTime)
+ {
+ return SwarmDb.GetDatabaseForReading()
+ .GetParticipantCountForOrganizationsSince (new[] {orgId}, sinceDateTime);
+ }
+
+ public static int GetParticipantCountForOrganizations (Organizations organizations)
+ {
+ List idArray = new List();
+
+ foreach (Organization organization in organizations)
+ {
+ idArray.Add (organization.Identity);
+ }
+
+ return GetParticipantCountForOrganizations (idArray.ToArray());
+ }
+
+ public static Participations ForOrganization (Organization organization, bool includeTerminated)
+ {
+ if (!includeTerminated)
+ {
+ return ForOrganization (organization);
+ }
+
+ return FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (organization));
+ }
+
+ public static Participations ForOrganization (Organization organization)
+ {
+ return
+ FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (organization, DatabaseCondition.ActiveTrue));
+ }
+
+ public static Participations ForOrganizations (Organizations organizations, bool includeTerminated)
+ {
+ if (!includeTerminated)
+ {
+ return ForOrganizations (organizations);
+ }
+
+ return FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (organizations));
+ }
+
+ public static Participations ForOrganizations (Organizations organizations)
+ {
+ return
+ FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (organizations, DatabaseCondition.ActiveTrue));
+ }
+
+ public static Participations GetExpiring (Organization organization, DateTime dateExpiry)
+ {
+ return GetExpiring (organization, dateExpiry, dateExpiry);
+ }
+
+ public static Participations GetExpired (Organization organization)
+ {
+ return
+ FromArray (SwarmDb.GetDatabaseForReading().GetExpiringParticipations (organization, DateTime.MinValue,
+ DateTime.Now));
+ }
+
+ public static Participations GetExpired (Organization organization, DateTime lowerBound, DateTime upperBound)
+ {
+ return
+ FromArray (SwarmDb.GetDatabaseForReading()
+ .GetExpiringParticipations (organization, lowerBound, upperBound, DatabaseCondition.None));
+ }
+
+ public static Participations GetExpiring (Organization organization, DateTime lowerBound, DateTime upperBound)
+ {
+ return
+ FromArray (SwarmDb.GetDatabaseForReading().GetExpiringParticipations (organization, lowerBound, upperBound));
+ }
+
+
+ public static Dictionary> GetParticipationsForPeople (int[] personIds, int gracePeriod)
+ {
+ return SwarmDb.GetDatabaseForReading().GetParticipationsForPeople (personIds, gracePeriod);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Logic/Swarm/People.cs b/Logic/Swarm/People.cs
index 4529cff1..40d96ce1 100644
--- a/Logic/Swarm/People.cs
+++ b/Logic/Swarm/People.cs
@@ -19,11 +19,11 @@ namespace Swarmops.Logic.Swarm
get { return LogicServices.ObjectsToIdentifiers (ToArray()); }
}
- public static People FromMemberships (Memberships memberships)
+ public static People FromMemberships (Participations participations)
{
List personIds = new List();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
personIds.Add (membership.PersonId);
}
@@ -312,9 +312,9 @@ namespace Swarmops.Logic.Swarm
// Get the list of all memberships
- Dictionary> memberships =
+ Dictionary> memberships =
SwarmDb.GetDatabaseForReading()
- .GetMembershipsForPeople (LogicServices.ObjectsToIdentifiers (candidates));
+ .GetParticipationsForPeople (LogicServices.ObjectsToIdentifiers (candidates));
People result = new People();
@@ -324,7 +324,7 @@ namespace Swarmops.Logic.Swarm
if (memberships.ContainsKey (basicPerson.Identity))
{
- foreach (BasicMembership membership in memberships[basicPerson.Identity])
+ foreach (BasicParticipation membership in memberships[basicPerson.Identity])
{
if (lookup.ContainsKey (membership.OrganizationId))
{
diff --git a/Logic/Swarm/Person.cs b/Logic/Swarm/Person.cs
index 3cbcd53d..717e7cb0 100644
--- a/Logic/Swarm/Person.cs
+++ b/Logic/Swarm/Person.cs
@@ -397,7 +397,7 @@ namespace Swarmops.Logic.Swarm
//not set, make a guess...
- foreach (Membership ms in GetMemberships (false))
+ foreach (Participation ms in GetMemberships (false))
{
try
{
@@ -616,21 +616,21 @@ namespace Swarmops.Logic.Swarm
}
- public Memberships GetMemberships (bool includeTerminated)
+ public Participations GetMemberships (bool includeTerminated)
{
if (!includeTerminated)
{
return GetMemberships();
}
- return Memberships.FromArray (SwarmDb.GetDatabaseForReading().GetMemberships (this));
+ return Participations.FromArray (SwarmDb.GetDatabaseForReading().GetParticipations (this));
}
- public Memberships GetMemberships()
+ public Participations GetMemberships()
{
return
- Memberships.FromArray (SwarmDb.GetDatabaseForReading()
- .GetMemberships (this, DatabaseCondition.ActiveTrue));
+ Participations.FromArray (SwarmDb.GetDatabaseForReading()
+ .GetParticipations (this, DatabaseCondition.ActiveTrue));
}
@@ -640,12 +640,12 @@ namespace Swarmops.Logic.Swarm
/// For exired, number of days to add to allow it to be returned
///
///
- public Membership GetRecentMembership (int gracePeriod, int orgId)
+ public Participation GetRecentMembership (int gracePeriod, int orgId)
{
List orgIdList = new List();
orgIdList.Add (orgId);
- Memberships mss = GetRecentMemberships (orgIdList, gracePeriod);
- foreach (Membership ms in mss)
+ Participations mss = GetRecentMemberships (orgIdList, gracePeriod);
+ foreach (Participation ms in mss)
{
if (ms.OrganizationId == orgId)
return ms;
@@ -658,7 +658,7 @@ namespace Swarmops.Logic.Swarm
///
/// For exired, number of days to add to allow it to be returned
///
- public Memberships GetRecentMemberships (int gracePeriod)
+ public Participations GetRecentMemberships (int gracePeriod)
{
List orgIdList = new List();
return GetRecentMemberships (orgIdList, gracePeriod);
@@ -670,7 +670,7 @@ namespace Swarmops.Logic.Swarm
/// List of ids. If empty, all orgs
/// For exired, number of days to add to allow it to be returned
///
- public Memberships GetRecentMemberships (Organizations orgs, int gracePeriod)
+ public Participations GetRecentMemberships (Organizations orgs, int gracePeriod)
{
List orgIdList = new List (orgs.Identities);
return GetRecentMemberships (orgIdList, gracePeriod);
@@ -682,16 +682,16 @@ namespace Swarmops.Logic.Swarm
/// List of ids. If empty, all orgs
/// For exired, number of days to add to allow it to be returned
///
- public Memberships GetRecentMemberships (List orgs, int gracePeriod)
+ public Participations GetRecentMemberships (List orgs, int gracePeriod)
{
- Memberships memberships = GetMemberships (true);
- Dictionary collectMembers = new Dictionary();
+ Participations participations = GetMemberships (true);
+ Dictionary collectMembers = new Dictionary();
- memberships.Sort (
- delegate (Membership ms1, Membership ms2) { return ms2.DateTerminated.CompareTo (ms1.DateTerminated); });
+ participations.Sort (
+ delegate (Participation ms1, Participation ms2) { return ms2.DateTerminated.CompareTo (ms1.DateTerminated); });
//Keep one for each org, the active one or the one with the highest Terminationdate
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (orgs.Count == 0 || orgs.Contains (membership.OrganizationId))
{
@@ -710,13 +710,13 @@ namespace Swarmops.Logic.Swarm
}
}
- Memberships collectedMS = new Memberships();
+ Participations collectedMS = new Participations();
collectedMS.AddRange (collectMembers.Values);
if (collectedMS.Count > 0)
{
//sort to get most recent first
- collectedMS.Sort (delegate (Membership ms1, Membership ms2)
+ collectedMS.Sort (delegate (Participation ms1, Participation ms2)
{
if (ms1.Active && ms1.Active != ms2.Active)
return -1; // active before terminated
@@ -785,14 +785,14 @@ namespace Swarmops.Logic.Swarm
return newPerson;
}
- public Membership AddMembership (Organization organization, DateTime expires)
+ public Participation AddMembership (Organization organization, DateTime expires)
{
return AddMembership (organization.Identity, expires);
}
- public Membership AddMembership (int organizationId, DateTime expires)
+ public Participation AddMembership (int organizationId, DateTime expires)
{
- return Membership.Create (Identity, organizationId, expires);
+ return Participation.Create (Identity, organizationId, expires);
}
private bool? HasExplicitSubscription (int newsletterFeedId)
@@ -1023,9 +1023,9 @@ namespace Swarmops.Logic.Swarm
public bool MemberOf (int orgId)
{
- Memberships memberships = GetMemberships();
+ Participations participations = GetMemberships();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId == orgId)
{
@@ -1038,8 +1038,8 @@ namespace Swarmops.Logic.Swarm
public bool MemberOfWithInherited (int orgId)
{
- Memberships memberships = GetMemberships();
- foreach (Membership membership in memberships)
+ Participations participations = GetMemberships();
+ foreach (Participation membership in participations)
{
if (membership.Organization.IsOrInherits (orgId))
{
diff --git a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
index b57fb55a..e4a5ecfd 100644
--- a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
+++ b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs
@@ -137,7 +137,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin
Positions.CreateOrganizationDefaultPositions (newOrganization, titleType);
- Membership.Create (CurrentUser, newOrganization, DateTime.UtcNow.AddYears (2));
+ Participation.Create (CurrentUser, newOrganization, DateTime.UtcNow.AddYears (2));
string successMessage = String.Format (Resources.Pages.Admin.CreateOrganization_Success,
Participant.Localized (peopleLabel, TitleVariant.Ship));
diff --git a/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs b/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs
index 999201ac..3cd844ba 100644
--- a/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs
+++ b/Site5/Pages/v5/Security/ChangeOrganizations.aspx.cs
@@ -31,10 +31,10 @@ namespace Swarmops.Frontend.Pages.v5.Security
private void PopulateRepeater()
{
- Memberships memberships = CurrentUser.GetMemberships();
+ Participations participations = CurrentUser.GetMemberships();
List availableOrganizations = new List();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId == 1 && !PilotInstallationIds.IsPilot (PilotInstallationIds.PiratePartySE))
{
diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
index d0b1f263..b6119466 100644
--- a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
+++ b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
@@ -114,14 +114,14 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
street, this.TextPostal.Text, this.TextCity.Text, this.DropCountries.SelectedValue, dateOfBirth,
(PersonGender)Enum.Parse(typeof(PersonGender), this.DropGenders.SelectedValue));
- Membership newMembership = Membership.Create (newPerson, CurrentOrganization, DateTime.Today.AddYears (1));
+ Participation newParticipation = Participation.Create (newPerson, CurrentOrganization, DateTime.Today.AddYears (1));
- OutboundComm.CreateMembershipLetter (ParticipantMailType.MemberAddedWelcome, newMembership, CurrentUser);
+ OutboundComm.CreateMembershipLetter (ParticipantMailType.MemberAddedWelcome, newParticipation, CurrentUser);
SwarmopsLogEntry logEntry = SwarmopsLog.CreateEntry (newPerson,
- new Swarmops.Logic.Support.LogEntries.PersonAddedLogEntry (newMembership, CurrentUser));
+ new Swarmops.Logic.Support.LogEntries.PersonAddedLogEntry (newParticipation, CurrentUser));
- logEntry.CreateAffectedObject (newMembership);
+ logEntry.CreateAffectedObject (newParticipation);
logEntry.CreateAffectedObject (CurrentUser);
// Clear form and make way for next person
diff --git a/Utility/BotCode/InternalPollMaintenance.cs b/Utility/BotCode/InternalPollMaintenance.cs
index bc67855f..d736e418 100644
--- a/Utility/BotCode/InternalPollMaintenance.cs
+++ b/Utility/BotCode/InternalPollMaintenance.cs
@@ -54,16 +54,16 @@ namespace Swarmops.Utility.BotCode
Organizations orgTree = poll.Organization.ThisAndBelow();
- Memberships memberships = Memberships.ForOrganizations (orgTree);
+ Participations participations = Participations.ForOrganizations (orgTree);
Dictionary dupeCheck = new Dictionary();
int count = 0;
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
Console.Write ("\r - voters: {0:D6}/{1:D6} (person #{2:D6})...", ++count,
- memberships.Count, membership.PersonId);
+ participations.Count, membership.PersonId);
if (!membership.Active)
{
diff --git a/Utility/BotCode/RosterHousekeeping.cs b/Utility/BotCode/RosterHousekeeping.cs
index 314c4d12..53cdc0aa 100644
--- a/Utility/BotCode/RosterHousekeeping.cs
+++ b/Utility/BotCode/RosterHousekeeping.cs
@@ -34,14 +34,14 @@ namespace Swarmops.Utility.BotCode
{
if (org.AcceptsMembers)
{
- Memberships memberships = org.GetMemberships();
+ Participations participations = org.GetMemberships();
string orgSummary = org.Name + "\r\n";
// Iterate over membership roster and filter by date
List relevantPersonIds = new List();
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.MemberSince > membersAfter && membership.MemberSince < membersBefore)
{
@@ -112,9 +112,9 @@ namespace Swarmops.Utility.BotCode
foreach (Organization org in orgs)
{
- Memberships memberships = Memberships.GetExpiring (org, lowerBound, upperBound);
+ Participations participations = Participations.GetExpiring (org, lowerBound, upperBound);
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
if (membership.OrganizationId%7 != weekDayInteger)
{
@@ -206,10 +206,10 @@ namespace Swarmops.Utility.BotCode
foreach (Organization organization in organizations)
{
- Memberships memberships = Memberships.GetExpired (organization);
+ Participations participations = Participations.GetExpired (organization);
// Mail each expiring member
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
//only remove expired memberships
if (membership.Expires > DateTime.Now.Date)
@@ -222,13 +222,13 @@ namespace Swarmops.Utility.BotCode
// Mail
- Memberships personMemberships = person.GetMemberships();
- Memberships membershipsToDelete = new Memberships();
- foreach (Membership personMembership in personMemberships)
+ Participations personParticipations = person.GetMemberships();
+ Participations participationsToDelete = new Participations();
+ foreach (Participation personMembership in personParticipations)
{
if (personMembership.Expires <= DateTime.Now.Date)
{
- membershipsToDelete.Add (personMembership);
+ participationsToDelete.Add (personMembership);
}
}
@@ -236,15 +236,15 @@ namespace Swarmops.Utility.BotCode
ExpiredMail expiredmail = new ExpiredMail();
string membershipsIds = "";
- if (membershipsToDelete.Count > 1)
+ if (participationsToDelete.Count > 1)
{
- foreach (Membership personMembership in membershipsToDelete)
+ foreach (Participation personMembership in participationsToDelete)
{
membershipsIds += "," + personMembership.MembershipId;
}
membershipsIds = membershipsIds.Substring (1);
string expiredMemberships = "";
- foreach (Membership personMembership in membershipsToDelete)
+ foreach (Participation personMembership in participationsToDelete)
{
if (personMembership.OrganizationId != organization.Identity)
{
@@ -272,7 +272,7 @@ namespace Swarmops.Utility.BotCode
string orgIdString = string.Empty;
- foreach (Membership personMembership in membershipsToDelete)
+ foreach (Participation personMembership in participationsToDelete)
{
if (personMembership.Active)
{
@@ -292,11 +292,11 @@ namespace Swarmops.Utility.BotCode
foreach (Organization org in orgs)
{
- Memberships memberships = Memberships.GetExpiring (org, dateExpiry);
+ Participations participations = Participations.GetExpiring (org, dateExpiry);
// Mail each expiring member
- foreach (Membership membership in memberships)
+ foreach (Participation membership in participations)
{
try
{
@@ -376,7 +376,7 @@ namespace Swarmops.Utility.BotCode
}
[Obsolete ("Generalize and localize this function.", true)]
- public static void SendReminderMail (Membership membership)
+ public static void SendReminderMail (Participation participation)
{
/*
// First, determine the organization template to use. Prioritize a long ancestry.