dsu 0.1.0.alpha.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27f3abb1daf923976963a1612f08258fd8a0460d672c1674dc2c149aa69ed03
-  data.tar.gz: 8611ccb51518e24f9497ffc0c02a7b1dd567321419728f727969718620da5b59
+  metadata.gz: fa1b6f69c4de21d556a38cd96f29ba9ad8b7b4b2a9f5d34cda7fccb61f15d63f
+  data.tar.gz: 7376022ead177228164448d6fa4b8ee554a35611d45450955c586ed1bf84462a
 SHA512:
-  metadata.gz: d1b1bcd4f9222bf2629ffa0d02434b429280f20e760676f2cde2eaca40860f56952995ce7a69628981cc0f7caf941a48c07cca91a9c1f96b4334e872d5a7374a
-  data.tar.gz: 0436e614b146dbfd71ca098cc699d7b6de99cafe47cfbad8141ac6268853b6f7d68285d8222053796bb2db729cf86c14e03e3fa3f2dca97554fd78998449fbbe
+  metadata.gz: 7128d03202e5f9536e6fda51c2dab009dd0ed32f56f00e17b6d1c96cb5420daa8dd0ab71c69d25f811ee41acf14cda05d133211f3b9480b70907736201d7162b
+  data.tar.gz: bc276d357add40377ec88b79b8379fad502cea936440c31a81e7e0ed18c1ad766244f0a09b9eb33a1536a0d60d2c7140b429d5643aa6a3d51b2f362cdec60673

data/.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
     - '.idea/**/*'
     - 'init/*'
     - 'Rakefile'
-#    - '*.gemspec'
+    - '*.gemspec'
 #    - 'spec/**/*'
     - 'vendor/**/*'
     - 'scratch*.rb'

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.0.0] - 2023-05-18
+* First official release.
+* NOTE: If you have been using the alpha version of `dsu`, you will need to delete the `entries` folder (e.g. `/Users/<whoami>/dsu/entries` on a nix os) as the old entries .json files are incompatible with this official release.
+* Changes from the alpha version
+  - When editing an entry group, editor commands are no longer necessary. Simply add, remove or change entries as needed. See the README.md for more information.
+  - When editing an entry group and saving the results, take note of the folowing behavior:
+    - Entering duplicate entries are not allowed, only one entry with a given description is allowed per entry group.
+    - Entering entries whose descriptions are < 2 or > 256 characters will fail validation and will not be saved.
+    - When editing and encountering any of the aforementioned, the errors will be displayed to the console after the editor file is saved.
+  - Sha's are no longer being used, as I've not found a good use (currently) to use them. I may add them back in the future if I find a good use for them (tracking entries across entry groups, etc.).
+  - When adding an entry (`dsu add OPTION`), it used to be that after the entry was added, the entry group for the date being edited would be displayed, as well as "yesterday's" date. This is no longer the case; now, only the entry group for the date being edited is displayed.
+## [0.1.0.alpha.5] - 2023-05-12
+* Changes
+  - `dsu edit SUBCOMMAND` will now allow editing of an entry group for a date that does not yet exist. This will allow you to add entries in the editor using `+|a|add DESCRIPTION`. Be sure to follow the instructions in the editor when editing entry group entries.
+  - `dsu edit SUBCOMMAND` will gracefully display an error if the entry sha (Entry#uuid) or entry discription (Entry#description) are not unique. In this case, the entry will not be added to the entry group.
+  NOTE: Not all edge cases are being handled currently by `dsu edit SUBCOMMAND`.
+  - `dsu add OPTION` will raise an error if the entry discription (Entry#description) are not unique. This will be handled gracefully in a future release.
 ## [0.1.0.alpha.4] - 2023-05-09
 * Changes
   - Gemfile gemspec description changes.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (0.1.0.alpha.4)
+    dsu (1.0.0)
       activesupport (~> 7.0, >= 7.0.4)
       colorize (~> 0.8.1)
       deco_lite (~> 1.3)

data/README.md

@@ -9,8 +9,6 @@
 ## About
 `dsu` is little gem that helps manage your Agile DSU (Daily Stand Up) participation. How? by providing a simple command line interface (CLI) which allows you to create, read, update, and delete (CRUD) noteworthy activities that you performed during your day. During your DSU, you can then easily recall and share these these activities with your team. Activities are grouped by day and can be viewed in simple text format from the command line. When viewing a particular day, `dsu` will automatically display the previous day's activities as well. This is useful for remembering what you did yesterday, so you can share your "Today" and "Yesterday" activities with your team during your DSU. If the day you are trying to view falls on a weekend or Monday, `dsu` will display back to, and including the weekend and previous Friday inclusive, so that you can share what you did over the weekend (if anything) and the previous Friday.
 
-**NOTE:** This gem is in development (alpha version). Please see the [WIP Notes](#wip-notes) section for current `dsu` features.
-
 ## Help
 
 After installation (`gem install dsu`), the first thing you may want to do is run the `dsu` help:
@@ -19,7 +17,7 @@ After installation (`gem install dsu`), the first thing you may want to do is ru
 ```shell
 #=>
 Commands:
-  dsu add, -a [OPTIONS] DESCRIPTION  # Adds a DSU entry having DESCRIPTION to the date associated with the given OPTION
+  dsu add, -a [OPTIONS] DESCRIPTION  # Adds a DSU entry...
   dsu config, -c SUBCOMMAND          # Manage configuration...
   dsu edit, -e SUBCOMMAND            # Edit DSU entries...
   dsu help [COMMAND]                 # Describe available...
@@ -35,7 +33,7 @@ The next thing you may want to do is `add` some DSU activities (entries) for a p
 ## Adding DSU Entries
 `dsu add [OPTIONS] DESCRIPTION`
 
-Adding DSU entry using this command will _add_ the DSU entry for the given day (or date, `-d`), and also _display_ the given day's (or date's, `-d`) DSU entries, as well as the DSU entries for the previous day relative to the given day or date (`-d`).
+Adding DSU entry using this command will _add_ the DSU entry for the given day (or date, `-d`), and also _display_ the given day's (or date's, `-d`) DSU entries, as well as the DSU entries for the previous day relative to the given day or date (`-d`). *NOTE: You cannot add duplicate entry group entries; that is, the entry DESCRIPTION needs to be unique within an entry group.*
 
 ### Today
 If you need to add a DSU entry to the current day (today), you can use the `-n`|`--today` option. Today (`-n`) is the default; therefore, the `-n` flag is optional when adding DSU entries for the current day:
@@ -97,7 +95,7 @@ Friday, (Yesterday) 2023-05-05
 ```
 ## Editing DSU Entries
 
-You can edit DSU entry groups by date. `dsu` will allow you to edit a DSU entry group using the `dsu edit SUBCOMMAND` date (today|tomorrow|yesterday|date DATE) you specify. `dsu edit` will open your DSU entry group entries in your editor, where you'll be able to perform editing functions against one or all of the entries.
+You can edit DSU entry groups by date. `dsu` will allow you to edit a DSU entry group using the `dsu edit SUBCOMMAND` date (today|tomorrow|yesterday|date DATE) you specify. `dsu edit` will open your DSU entry group entries in your editor, where you'll be able to perform editing functions against one or all of the entries. If no entries exist in the entry group the the date, the editor will allow you to add entries for that date. *NOTE: duplicate entries are not allowed; that is, the entry DESCRIPTION need to be unique within an entry group. Non-unique entries will not be added to the entry group. The same holds true for entries whose DESCRIPTION that do not pass validation (between 2 and 256 characters (inclusive) in length).*
 
 Note: See the "[Customizing the `dsu` Configuration File](#customizing-the-dsu-configuration-file)"" section to configure `dsu` to use the editor of your choice.
 
@@ -116,20 +114,19 @@ The following will edit your DSU entry group entries for "Today", where `Time.no
 ```shell
 #=> In your editor, you will see...
 # Editing DSU Entries for Tuesday, (Today) 2023-05-09 EDT
-
-# [SHA/COMMAND] [DESCRIPTION]
-3849f0c0 Interative planning meeting 11:00AM.
-586478f5 Pair with Chad on ticket 31211.
-9e5f82c8 Investigate spike ticket 31255.
-59b25ca7 Review Kelsey's PR ticket 30721.
+# [ENTRY DESCRIPTION]
+Interative planning meeting 11:00AM.
+Pair with Chad on ticket 31211.
+Investigate spike ticket 31255.
+Review Kelsey's PR ticket 30721.
 
 # INSTRUCTIONS:
-# ADD a DSU entry: use one of the following commands: [+|a|add] followed by the description.
-# EDIT a DSU entry: change the description.
-# DELETE a DSU entry: delete the entry or replace the sha with one of the following commands: [-|d|delete].
-# NOTE: deleting all the entries will delete the entry group file;
-#       this is preferable if this is what you want to do :)
-# REORDER a DSU entry: reorder the DSU entries in order preference.
+#    ADD a DSU entry: type an ENTRY DESCRIPTION on a new line.
+#   EDIT a DSU entry: change the existing ENTRY DESCRIPTION.
+# DELETE a DSU entry: delete the ENTRY DESCRIPTION.
+#  NOTE: deleting all of the ENTRY DESCRIPTIONs will delete the entry group file;
+#        this is preferable if this is what you want to do :)
+# REORDER a DSU entry: reorder the ENTRY DESCRIPTIONs in order preference.
 #
 # *** When you are done, save and close your editor ***
 ```
@@ -140,32 +137,28 @@ Simply change the entry descripton text.
 
 For example...
 ```
-from: 3849f0c0 Interative planning meeting 11:00AM.
-  to: 3849f0c0 Interative planning meeting 12:00AM.
+from: Interative planning meeting 11:00AM.
+  to: Interative planning meeting 12:00AM.
 ```
 
 #### Add an Entry
 
-Replace the entry `sha` one of the add commands: `[+|a|add]`.
+Simply type a new entry on a separate line. *Note: any entry that starts with a `#` in the first character position will be ignored.*
 
 For example...
 ```
-+ Add me to this entry group.
+Add me to this entry group.
 ```
 
 #### Delete an Entry
 
-Simply delete the entry or replace the entry `sha` one of the delete commands: `[-|d|delete]`.
+Simply delete the entry.
 
 For example...
 ```
 # Delete this this entry from the editor file
-3849f0c0 Interative planning meeting 11:00AM.
-```
-or
-```
-from: 3849f0c0 Interative planning meeting 11:00AM.
-  to: - Interative planning meeting 11:00AM.
+from: Interative planning meeting 11:00AM.
+  to: <deleted>
 ```
 
 #### Reorder Entries
@@ -174,14 +167,14 @@ Simply reorder the entries in the editor.
 
 For example...
 ```
-from: 3849f0c0 Interative planning meeting 11:00AM.
-      586478f5 Pair with Chad on ticket 31211.
-      9e5f82c8 Investigate spike ticket 31255.
-      59b25ca7 Review Kelsey's PR ticket 30721.
-  to: 59b25ca7 Review Kelsey's PR ticket 30721.
-      9e5f82c8 Investigate spike ticket 31255.
-      586478f5 Pair with Chad on ticket 31211.
-      3849f0c0 Interative planning meeting 11:00AM.
+from: Interative planning meeting 11:00AM.
+      Pair with Chad on ticket 31211.
+      Investigate spike ticket 31255.
+      Review Kelsey's PR ticket 30721.
+  to: Review Kelsey's PR ticket 30721.
+      Investigate spike ticket 31255.
+      Pair with Chad on ticket 31211.
+      Interative planning meeting 11:00AM.
 ```
 
 ## Customizing the `dsu` Configuration File
@@ -242,9 +235,6 @@ These notes apply to anywhere DATE is used...
 
 DATE may be any date string that can be parsed using `Time.parse`. Consequently, you may use also use '/' as date separators, as well as omit the year if the date you want to display is the current year (e.g. <month>/<day>, or 1/31). For example: `require 'time'; Time.parse('2023-01-02'); Time.parse('1/2') # etc.`
 
-## WIP Notes
-This gem is in development (alpha release).
-
 ## Installation
 
     $ gem install dsu

data/lib/dsu/base_cli.rb

@@ -15,9 +15,6 @@ require_relative 'version'
 require_relative 'views/entry_group/show'
 
 module Dsu
-  #
-  # The `dsu` command.
-  #
   class BaseCLI < ::Thor
     include Support::Colorable
     include Support::EntryGroupViewable

data/lib/dsu/cli.rb

@@ -30,14 +30,21 @@ module Dsu
       \x5
       -d DATE: Adds a DSU entry having DESCRIPTION to the DATE.
 
-      \x5 #{date_option_description}
+      \x5
+      #{date_option_description}
 
-      \x5 -n: Adds a DSU entry having DESCRIPTION to today's date (`Time.now`).
+      \x5
+      -n: Adds a DSU entry having DESCRIPTION to today's date (`Time.now`).
 
-      \x5 -t: Adds a DSU entry having DESCRIPTION to tomorrow's date (`Time.new.tomorrow`).
+      \x5
+      -t: Adds a DSU entry having DESCRIPTION to tomorrow's date (`Time.new.tomorrow`).
 
-      \x5 -y: Adds a DSU entry having DESCRIPTION to yesterday's date (`Time.new.yesterday`).
+      \x5
+      -y: Adds a DSU entry having DESCRIPTION to yesterday's date (`Time.new.yesterday`).
 
+      DESCRIPTION:
+      \x5
+      Must be be between 2 and 256 characters (inclusive) in length.
     LONG_DESC
     option :date, type: :string, aliases: '-d'
     option :tomorrow, type: :boolean, aliases: '-t'
@@ -45,52 +52,50 @@ module Dsu
     option :today, type: :boolean, aliases: '-n', default: true
 
     def add(description)
-      times = if options[:date].present?
-        time = Time.parse(options[:date])
-        [time, time.yesterday]
+      time = if options[:date].present?
+        Time.parse(options[:date])
       else
-        time = Time.now
         if options[:tomorrow].present?
-          [time.tomorrow, time.tomorrow.yesterday]
+          Time.now.tomorrow
         elsif options[:yesterday].present?
-          [time.yesterday, time.yesterday.yesterday]
+          Time.now.yesterday
         elsif options[:today].present?
-          [time, time.yesterday]
+          Time.now
         end
       end
       entry = Models::Entry.new(description: description)
-      # NOTE: We need to add the Entry to the date that is the furthest in the future
-      # (time.max) because this is the DSU entry that the user specified.
-      CommandServices::AddEntryService.new(entry: entry, time: times.max).call
-      sorted_dsu_times_for(times: times).each do |t|
-        view_entry_group(time: t)
-        puts
-      end
+      CommandServices::AddEntryService.new(entry: entry, time: time).call
+      view_entry_group(time: time)
     end
 
+    # def add(description)
+    #   times = if options[:date].present?
+    #     time = Time.parse(options[:date])
+    #     [time, time.yesterday]
+    #   else
+    #     time = Time.now
+    #     if options[:tomorrow].present?
+    #       [time.tomorrow, time.tomorrow.yesterday]
+    #     elsif options[:yesterday].present?
+    #       [time.yesterday, time.yesterday.yesterday]
+    #     elsif options[:today].present?
+    #       [time, time.yesterday]
+    #     end
+    #   end
+    #   entry = Models::Entry.new(description: description)
+    #   # NOTE: We need to add the Entry to the date that is the furthest in the future
+    #   # (time.max) because this is the DSU entry that the user specified.
+    #   CommandServices::AddEntryService.new(entry: entry, time: times.max).call
+    #   sorted_dsu_times_for(times: times).each do |t|
+    #     view_entry_group(time: t)
+    #     puts
+    #   end
+    # end
+
     desc 'list, -l SUBCOMMAND',
       'Displays DSU entries for the given SUBCOMMAND'
     subcommand :list, Subcommands::List
 
-    # TODO: Implement this.
-    # desc 'interactive', 'Opens a DSU interactive session'
-    # long_desc ''
-    # option :next_day, type: :boolean, aliases: '-n'
-    # option :previous_day, type: :boolean, aliases: '-p'
-    # option :today, type: :boolean, aliases: '-t'
-
-    # # https://stackoverflow.com/questions/4604905/interactive-prompt-with-thor
-    # def interactive
-    #   exit_commands = %w[x q exit quit]
-    #   display_interactive_help
-    #   loop do
-    #     command = ask('dsu > ')
-    #     display_interactive_help if command == 'h'
-    #     break if exit_commands.include? command
-    #   end
-    #   say 'Done.'
-    # end
-
     desc 'config, -c SUBCOMMAND',
       'Manage configuration file for this gem'
     subcommand :config, Subcommands::Config
@@ -104,17 +109,5 @@ module Dsu
     def version
       say VERSION
     end
-
-    private
-
-    def display_interactive_help
-      say 'Interactive Mode Commands:'
-      say '---'
-      say '[h]: show this help screen'
-      say '[t]: next day'
-      say '[y]: previous day'
-      say '[n]: today'
-      say '[x|q|exit|quit]: Exit interactive mode'
-    end
   end
 end

data/lib/dsu/command_services/add_entry_service.rb

@@ -1,60 +1,60 @@
 # frozen_string_literal: true
 
-require_relative '../services/entry_group_writer_service'
 require_relative '../models/entry'
+require_relative '../services/entry_group_writer_service'
+require_relative '../support/colorable'
+require_relative '../support/descriptable'
 require_relative '../support/entry_group_loadable'
 require_relative '../support/folder_locations'
+require_relative '../support/say'
+require_relative '../views/shared/messages'
 
 module Dsu
   module CommandServices
-    # This class adds (does NOT update) an entry to an entry group.
+    # This class adds (does NOT update) an entry to an entry group by
+    # writing it to the appropriate entry group json file.
     class AddEntryService
-      include Dsu::Support::EntryGroupLoadable
-      include Dsu::Support::FolderLocations
+      include Support::Colorable
+      include Support::Descriptable
+      include Support::EntryGroupLoadable
+      include Support::FolderLocations
+      include Support::Say
 
       attr_reader :entry, :entry_group, :time
 
+      delegate :description, to: :entry
+
       # :entry is an Entry object
       # :time is a Time object; the time of the entry group.
       def initialize(entry:, time:)
         raise ArgumentError, 'entry is nil' if entry.nil?
-        raise ArgumentError, 'entry is the wrong object type' unless entry.is_a?(Dsu::Models::Entry)
+        raise ArgumentError, 'entry is the wrong object type' unless entry.is_a?(Models::Entry)
         raise ArgumentError, 'time is nil' if time.nil?
         raise ArgumentError, 'time is the wrong object type' unless time.is_a?(Time)
 
         @entry = entry
         @time = time
-        @entry_group = Dsu::Models::EntryGroup.load(time: time)
+        @entry_group = Models::EntryGroup.load(time: time)
       end
 
       def call
         entry.validate!
         save_entry_group!
-        entry.uuid
-      rescue ActiveModel::ValidationError
-        puts "Error(s) encountered: #{entry.errors.full_messages}"
-        raise
+        entry
+      rescue ActiveModel::ValidationError => e
+        header = 'An error was encountered; the entry could not be added added:'
+        Views::Shared::Messages.new(messages: e.message, message_type: :error, options: { header: header }).render
       end
 
       private
 
       attr_writer :entry, :entry_group, :time
 
-      def entry_exists?
-        @entry_exists ||= entry_group.entries.include? entry.uuid
-      end
-
-      def entry_group_hash
-        @entry_group_hash ||= entry_group_hash_for time: time
-      end
-
       def save_entry_group!
-        raise "Entry #{entry.uuid} already exists in entry group #{time}" if entry_exists?
-
         entry_group.entries << entry
         entry_group.validate!
 
-        Dsu::Services::EntryGroupWriterService.new(entry_group: entry_group).call
+        Services::EntryGroupWriterService.new(entry_group: entry_group).call
       end
     end
   end

data/lib/dsu/models/entry.rb

@@ -1,39 +1,56 @@
 # frozen_string_literal: true
 
-require 'deco_lite'
+require 'active_model'
 require 'securerandom'
+require_relative '../support/descriptable'
+require_relative '../validators/description_validator'
 
 module Dsu
   module Models
-    class Entry < DecoLite::Model
-      validates :uuid, presence: true, format: {
-        with: /\A[0-9a-f]{8}\z/i,
-        message: 'is the wrong format. ' \
-                 '0-9, a-f, and 8 characters were expected.' \
-      }
-      validates :description, presence: true, length: { minimum: 2, maximum: 256 }
-
-      def initialize(description:, uuid: nil)
-        raise ArgumentError, 'description is nil' if description.nil?
+    # This class represents something someone might want to share at their
+    # daily standup (DSU).
+    class Entry
+      include ActiveModel::Model
+      include Support::Descriptable
+
+      validates_with Validators::DescriptionValidator
+
+      attr_reader :description
+
+      def initialize(description:)
         raise ArgumentError, 'description is the wrong object type' unless description.is_a?(String)
-        raise ArgumentError, 'uuid is the wrong object type' unless uuid.is_a?(String) || uuid.nil?
 
-        uuid ||= SecureRandom.uuid[0..7]
+        self.description = description
+      end
+
+      class << self
+        def clean_description(description)
+          return if description.nil?
 
-        super(hash: {
-          uuid: uuid,
-          description: description
-        })
+          description.strip.gsub(/\s+/, ' ')
+        end
       end
 
-      def required_fields
-        %i[uuid description]
+      def description=(description)
+        @description = self.class.clean_description description
       end
 
+      def to_h
+        { description: description }
+      end
+
+      # Override == and hash so that we can compare Entry objects based
+      # on description alone. This is useful for comparing entries in
+      # an array, for example.
       def ==(other)
         return false unless other.is_a?(Entry)
 
-        uuid == other.uuid && description == other.description
+        description == other.description
+      end
+      alias eql? ==
+
+      def hash
+        description.hash
       end
     end
   end

data/lib/dsu/models/entry_group.rb

@@ -1,41 +1,53 @@
 # frozen_string_literal: true
 
-require 'deco_lite'
-require_relative '../support/entry_group_loadable'
+require 'active_model'
+require_relative '../services/entry_group_editor_service'
 require_relative '../services/entry_group_deleter_service'
 require_relative '../services/entry_group_reader_service'
 require_relative '../services/entry_group_writer_service'
+require_relative '../support/entry_group_loadable'
+require_relative '../support/time_formatable'
 require_relative '../validators/entries_validator'
 require_relative '../validators/time_validator'
+require_relative 'entry'
 
 module Dsu
   module Models
-    class EntryGroup < DecoLite::Model
+    # This class represents a group of entries for a given day. IOW,
+    # things someone might want to share at their daily standup (DSU).
+    class EntryGroup
+      include ActiveModel::Model
       extend Support::EntryGroupLoadable
+      include Support::TimeFormatable
 
-      validates_with Validators::EntriesValidator, fields: [:entries]
-      validates_with Validators::TimeValidator, fields: [:time]
+      attr_accessor :time
+      attr_reader :entries
+
+      validates_with Validators::EntriesValidator
+      validates_with Validators::TimeValidator
 
       def initialize(time: nil, entries: [])
         raise ArgumentError, 'time is the wrong object type' unless time.is_a?(Time) || time.nil?
-        raise ArgumentError, 'entries is the wrong object type' unless entries.is_a?(Array) || entries.nil?
-
-        time ||= Time.now
-        time = time.localtime if time.utc?
 
-        entries ||= []
-
-        super(hash: {
-          time: time,
-          entries: entries
-        })
+        @time = ensure_local_time(time)
+        self.entries = entries || []
       end
 
       class << self
-        def delete(time:, options: {})
+        def delete!(time:, options: {})
           Services::EntryGroupDeleterService.new(time: time, options: options).call
         end
 
+        def edit(time:, options: {})
+          # NOTE: Uncomment this line to prohibit edits on
+          # Entry Groups that do not exist (i.e. have no entries).
+          # return new(time: time) unless exists?(time: time)
+
+          load(time: time).tap do |entry_group|
+            Services::EntryGroupEditorService.new(entry_group: entry_group, options: options).call
+          end
+        end
+
         def exists?(time:)
           Dsu::Services::EntryGroupReaderService.entry_group_file_exists?(time: time)
         end
@@ -43,47 +55,63 @@ module Dsu
         # Loads the EntryGroup from the file system and returns an
         # instantiated EntryGroup object.
         def load(time: nil)
-          new(**hydrated_entry_group_hash_for(time: time))
+          load_entry_group_file_for(time: time)
         end
 
         # This function returns a hash whose :time and :entries
         # key values are hydrated with instantiated Time and Entry
         # objects.
-        def hydrated_entry_group_hash_for(time:)
-          entry_group_hash = entry_group_hash_for(time: time)
-          hydrate_entry_group_hash(entry_group_hash: entry_group_hash, time: time)
+        def load_entry_group_for(time:)
+          load_entry_group_file_for(time: time)
         end
       end
 
-      def required_fields
-        %i[time entries]
+      def valid_unique_entries
+        entries&.select(&:valid?)&.uniq(&:description)
       end
 
-      def save!
-        validate!
-        Services::EntryGroupWriterService.new(entry_group: self).call
-        self
+      def clone
+        clone = super
+
+        clone.entries = clone.entries.map(&:clone)
+        clone
+      end
+
+      def entries=(entries)
+        entries ||= []
+
+        raise ArgumentError, 'entries is the wrong object type' unless entries.is_a?(Array)
+        raise ArgumentError, 'entries contains the wrong object type' unless entries.all?(Entry)
+
+        @entries = entries.map(&:clone)
       end
 
       # Deletes the entry group file from the file system.
-      def delete
-        self.class.delete(time: time)
+      def delete!
+        self.class.delete!(time: time)
+        self.entries = []
+        self
+      end
+
+      def save!
+        delete! and return if entries.empty?
+
+        validate!
+        Services::EntryGroupWriterService.new(entry_group: self).call
         self
       end
 
       def to_h
-        super.tap do |hash|
-          hash[:entries] = hash[:entries].dup
-          hash[:entries].each_with_index do |entry, index|
-            hash[:entries][index] = entry.to_h
-          end
-        end
+        {
+          time: time.dup,
+          entries: entries.map(&:to_h)
+        }
       end
 
-      def to_h_localized
-        to_h.tap do |hash|
-          hash[:time] = hash[:time].localtime
-        end
+      private
+
+      def ensure_local_time(time)
+        time.nil? ? Time.now : time.dup.localtime
       end
     end
   end