subscription renamed to memberSubscription (DevBetterCom#337)

thivigit · Jun 14, 2021 · 550466e · 550466e
1 parent facd26d
commit 550466e
Show file tree

Hide file tree

Showing 16 changed files with 721 additions and 72 deletions.
diff --git a/src/DevBetterWeb.Core/Entities/Member.cs b/src/DevBetterWeb.Core/Entities/Member.cs
@@ -53,7 +53,7 @@ internal Member(string userId)
     public List<Book> BooksRead { get; set; } = new List<Book>();
 
     public DateTime DateCreated { get; private set; } = DateTime.UtcNow;
-    public List<Subscription> Subscriptions { get; set; } = new List<Subscription>();
+    public List<MemberSubscription> Subscriptions { get; set; } = new List<MemberSubscription>();
     public decimal? CityLatitude { get; set; }
     public decimal? CityLongitude { get; set; }
     public List<BillingActivity> BillingActivities { get; set; } = new List<BillingActivity>();
@@ -212,7 +212,7 @@ public void RemoveBookRead(Book book)
 
     public void AddSubscription(DateTimeRange subscriptionDateTimeRange)
     {
-      var subscription = new Subscription();
+      var subscription = new MemberSubscription();
       subscription.MemberId = this.Id;
       subscription.Dates = subscriptionDateTimeRange;
 
@@ -225,7 +225,7 @@ public void ExtendCurrentSubscription(DateTime newEndDate)
     {
       for (int i = 0; i < Subscriptions.Count; i++)
       {
-        Subscription s = Subscriptions[i];
+        MemberSubscription s = Subscriptions[i];
         if (s.Dates.Contains(DateTime.Today))
         {
           s.Dates = new DateTimeRange(s.Dates.StartDate, newEndDate);

diff --git a/...evBetterWeb.Core/Entities/Subscription.cs → ...erWeb.Core/Entities/MemberSubscription.cs b/...evBetterWeb.Core/Entities/Subscription.cs → ...erWeb.Core/Entities/MemberSubscription.cs
@@ -4,7 +4,7 @@
 
 namespace DevBetterWeb.Core.Entities
 {
-  public class Subscription : BaseEntity, IAggregateRoot
+  public class MemberSubscription : BaseEntity, IAggregateRoot
   {
     //public DateTime StartDate { get; set; }
     //public DateTime? EndDate { get; set; }

diff --git a/src/DevBetterWeb.Core/Interfaces/IMemberSubscriptionPeriodCalculationsService.cs b/src/DevBetterWeb.Core/Interfaces/IMemberSubscriptionPeriodCalculationsService.cs
@@ -6,7 +6,7 @@ namespace DevBetterWeb.Core.Interfaces
   public interface IMemberSubscriptionPeriodCalculationsService
   {
     bool GetHasCurrentSubscription(Member member);
-    Subscription GetCurrentSubscription(Member member);
+    MemberSubscription GetCurrentSubscription(Member member);
     DateTime GetCurrentSubscriptionEndDate(Member member);
     DateTime GetGraduationDate(Member member);
     int GetPercentageProgressToAlumniStatus(Member member);

diff --git a/src/DevBetterWeb.Core/Services/MemberSubscriptionPeriodCalculationsService.cs b/src/DevBetterWeb.Core/Services/MemberSubscriptionPeriodCalculationsService.cs
@@ -33,7 +33,7 @@ public DateTime GetGraduationDate(Member member)
     }
 
     // none of these methods should ever be called if member does not have current subscription
-    public Subscription GetCurrentSubscription(Member member)
+    public MemberSubscription GetCurrentSubscription(Member member)
     {
 
       foreach (var subscription in member.Subscriptions)

diff --git a/src/DevBetterWeb.Core/Specs/SubscriptionsByMemberSpec.cs b/src/DevBetterWeb.Core/Specs/SubscriptionsByMemberSpec.cs
@@ -3,7 +3,7 @@
 
 namespace DevBetterWeb.Core.Specs
 {
-    public class SubscriptionsByMemberSpec : Specification<Subscription>
+    public class SubscriptionsByMemberSpec : Specification<MemberSubscription>
     {
         public SubscriptionsByMemberSpec(int memberId)
         {

diff --git a/src/DevBetterWeb.Infrastructure/Data/AppDbContext.cs b/src/DevBetterWeb.Infrastructure/Data/AppDbContext.cs
@@ -32,7 +32,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     public DbSet<Question>? Questions { get; set; }
     public DbSet<Member>? Members { get; set; }
     public DbSet<Book>? Books { get; set; }
-    public DbSet<Subscription>? Subscriptions { get; set; }
+    public DbSet<MemberSubscription>? Subscriptions { get; set; }
     public DbSet<Invitation>? Invitations { get; set; }
     public DbSet<BillingActivity>? BillingActivities { get; set; }
 

diff --git a/src/DevBetterWeb.Infrastructure/Data/Config/SubscriptionConfig.cs b/src/DevBetterWeb.Infrastructure/Data/Config/SubscriptionConfig.cs
@@ -5,9 +5,9 @@
 
 namespace DevBetterWeb.Infrastructure.Data.Config
 {
-    class SubscriptionConfig : IEntityTypeConfiguration<Subscription>
+    class SubscriptionConfig : IEntityTypeConfiguration<MemberSubscription>
     {
-        public void Configure(EntityTypeBuilder<Subscription> builder)
+        public void Configure(EntityTypeBuilder<MemberSubscription> builder)
         {
             builder.OwnsOne(x => x.Dates)
                    .ToTable("SubscriptionDates");