aemo 0.7.2 → 0.8.0

data/lib/aemo/nem12.rb

@@ -3,6 +3,7 @@
 require 'csv'
 require 'time'
 
+require 'aemo/meter_data/flag'
 require 'aemo/nem12/data_stream_suffix'
 require 'aemo/nem12/quality_method'
 require 'aemo/nem12/reason_codes'
@@ -17,6 +18,11 @@ module AEMO
     CRLF = "\r\n"
     CSV_SEPARATOR = ','
 
+    # Backward compatibility: delegate constants to Flag class
+    QUALITY_FLAGS = ::AEMO::MeterData::Flag::QUALITY_FLAGS
+    METHOD_FLAGS = ::AEMO::MeterData::Flag::METHOD_FLAGS
+    REASON_CODES = ::AEMO::MeterData::Flag::REASON_CODES
+
     @file_contents    = nil
     @header           = nil
     @nmi_data_details = []
@@ -258,17 +264,8 @@ module AEMO
         end
       end
 
-      # Deal with flags if necessary
-      flag = nil
-      # Based on QualityMethod and ReasonCode
-      if csv[intervals_offset + 0].length == 3 || !csv[intervals_offset + 1].nil?
-        flag ||= { quality_flag: nil, method_flag: nil, reason_code: nil }
-        if csv[intervals_offset + 0].length == 3
-          flag[:quality_flag] = csv[intervals_offset + 0][0]
-          flag[:method_flag] = csv[intervals_offset + 0][1, 2].to_i
-        end
-        flag[:reason_code] = csv[intervals_offset + 1].to_i unless csv[intervals_offset + 1].nil?
-      end
+      # Deal with flags - explicitly set all flag values
+      flag = AEMO::MeterData::Flag.from_quality_method_reason_code(quality_method: csv[intervals_offset + 0], reason_code: csv[intervals_offset + 1], validate: strict)
 
       # Deal with updated_at & msats_load_at
       updated_at = nil
@@ -302,7 +299,7 @@ module AEMO
     # @param [String] line A single line in string format
     # @param [Boolean] strict
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_400(line, strict: true) # rubocop:disable Lint/UnusedMethodArgument,Naming/VariableNumber
+    def parse_nem12_400(line, strict: true) # rubocop:disable Naming/VariableNumber
       csv = line.parse_csv
       raise ArgumentError, 'RecordIndicator is not 400'     if csv[0] != '400'
       raise ArgumentError, 'StartInterval is not valid'     if csv[1].nil? || csv[1].match(/^\d+$/).nil?
@@ -318,32 +315,30 @@ module AEMO
 
       interval_events = []
 
-      # Only need to update flags for EFSV
-      unless %w[A N].include? csv[3]
-        number_of_intervals = 1440 / @data_details.last[:interval_length]
-        interval_start_point = @interval_data.length - number_of_intervals
-
-        # For each of these
-        base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: csv[4]&.to_i,
-                                reason_description: csv[5] }
-
-        # Interval Numbers are 1-indexed
-        ((csv[1].to_i)..(csv[2].to_i)).each do |i|
-          interval_event = base_interval_event.dup
-          interval_event[:datetime] = @interval_data[interval_start_point + (i - 1)][:datetime]
-          interval_events << interval_event
-          # Create flag details
-          flag ||= { quality_flag: nil, method_flag: nil, reason_code: nil }
-          unless interval_event[:quality_method].nil?
-            flag[:quality_flag] = interval_event[:quality_method][0]
-            flag[:method_flag] = interval_event[:quality_method][1, 2].to_i
-          end
-          flag[:reason_code] = interval_event[:reason_code] unless interval_event[:reason_code].nil?
-          # Update with flag details
-          @interval_data[interval_start_point + (i - 1)][:flag] = flag
-        end
-        @interval_events += interval_events
+      number_of_intervals = 1440 / @data_details.last[:interval_length]
+      interval_start_point = @interval_data.length - number_of_intervals
+
+      # For each of these
+      # Parse reason code - only set if present and not empty
+      parsed_reason_code = nil
+      parsed_reason_code = csv[4].to_i unless csv[4].nil? || csv[4].empty?
+
+      base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: parsed_reason_code,
+                              reason_description: csv[5] }
+
+      # Interval Numbers are 1-indexed
+      ((csv[1].to_i)..(csv[2].to_i)).each do |i|
+        interval_event = base_interval_event.dup
+        interval_event[:datetime] = @interval_data[interval_start_point + (i - 1)][:datetime]
+        interval_events << interval_event
+
+        flag = AEMO::MeterData::Flag.from_quality_method_reason_code(quality_method: interval_event[:quality_method], reason_code: interval_event[:reason_code], validate: strict)
+
+        # Update with flag details
+        @interval_data[interval_start_point + (i - 1)][:flag] = flag
       end
+      @interval_events += interval_events
+
       interval_events
     end
 
@@ -361,20 +356,6 @@ module AEMO
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_900(_line, strict: true); end # rubocop:disable Naming/VariableNumber
 
-    # Turns the flag to a string
-    #
-    # @param [Hash] flag the object of a flag
-    # @return [nil, String] a hyphenated string for the flag or nil
-    def flag_to_s(flag)
-      flag_to_s = []
-      unless flag.nil?
-        flag_to_s << QUALITY_FLAGS[flag[:quality_flag]]                   unless QUALITY_FLAGS[flag[:quality_flag]].nil?
-        flag_to_s << METHOD_FLAGS[flag[:method_flag]][:short_descriptor]  unless METHOD_FLAGS[flag[:method_flag]].nil?
-        flag_to_s << REASON_CODES[flag[:reason_code]]                     unless REASON_CODES[flag[:reason_code]].nil?
-      end
-      flag_to_s.empty? ? nil : flag_to_s.join(' - ')
-    end
-
     # @return [Array] array of a NEM12 file a given Meter + Data Stream for easy reading
     def to_a
       @interval_data.map do |d|
@@ -384,7 +365,7 @@ module AEMO
           d[:data_details][:uom],
           d[:datetime],
           d[:value],
-          flag_to_s(d[:flag])
+          d[:flag]&.to_s
         ]
       end
     end
@@ -462,20 +443,36 @@ module AEMO
       end
       daily_datas.keys.sort.each do |key|
         daily_data = daily_datas[key].sort_by { |x| x[:datetime] }
-        has_flags = daily_data.map { |x| x[:flag]&.any? }.uniq.include?(true)
+
+        # Check if all intervals have identical flags
+        # If so, use that flag's quality method in the 300 record
+        # Otherwise use 'V' (variable data) and generate 400 records
+        first_flag = daily_data.first[:flag]
+        all_same_flag = daily_data.all? { |x| x[:flag] == first_flag }
+
+        if all_same_flag
+          # All intervals have the same flag - use it in the 300 record
+          quality_method = first_flag&.to_quality_method || ''
+          reason_code = first_flag&.reason_code || ''
+        else
+          # Intervals have different flags - use 'V' and generate 400 records
+          quality_method = 'V'
+          reason_code = ''
+        end
 
         lines << [
           '300',
           key,
           daily_data.map { |x| x[:value] },
-          has_flags ? 'V' : 'A',
-          '',
+          quality_method,
+          reason_code,
           '',
           daily_data.first[:updated_at] ? AEMO::Time.format_timestamp14(daily_data.first[:updated_at]) : nil,
           daily_data.first[:msats_load_at] ? AEMO::Time.format_timestamp14(daily_data.first[:msats_load_at]) : nil
         ].flatten.join(CSV_SEPARATOR)
 
-        next unless has_flags
+        # Generate 400 records only if we have variable data
+        next if all_same_flag
 
         lines << to_nem12_400_csv(daily_data:)
       end
@@ -504,12 +501,25 @@ module AEMO
       end
 
       nem12_400_rows.map do |row|
+        flag = row[:flag]
+        # Default to 'A' if flag is nil, otherwise use explicit quality flag
+        quality_flag = flag.nil? ? 'A' : flag.quality_flag
+        method_flag = flag&.method_flag
+        reason_code = flag&.reason_code
+
+        # Build quality method string (quality flag + optional method flag)
+        quality_method = if method_flag.nil?
+                           quality_flag
+                         else
+                           "#{quality_flag}#{format('%02d', method_flag)}"
+                         end
+
         [
           '400',
           row[:start_index],
           row[:finish_index],
-          row[:flag].nil? ? 'A' : "#{row[:flag][:quality_flag]}#{row[:flag][:method_flag]}",
-          row[:flag].nil? ? '' : row[:flag][:reason_code],
+          quality_method,
+          reason_code || '',
           ''
         ].join(CSV_SEPARATOR)
       end.join(CRLF)

data/lib/aemo/version.rb

@@ -23,7 +23,7 @@
 # @author Joel Courtney <euphemize@gmail.com>
 module AEMO
   # aemo version
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)

data/lib/data/xml_to_json.rb

@@ -40,39 +40,39 @@ end
 # Now to create the DLF and TNI output JSON files for use
 @files.select { |x| ['aemo-tni.xml', 'aemo-dlf.xml'].include?(x) }
       .each do |file|
-  output_file = file.gsub('.xml', '.json')
-  output_data = {}
-  open_file = File.open(File.join(@path, file))
-  xml = Nokogiri::XML(open_file) do |c|
-    c.options = Nokogiri::XML::ParseOptions::NOBLANKS
-  end
-  open_file.close
+        output_file = file.gsub('.xml', '.json')
+        output_data = {}
+        open_file = File.open(File.join(@path, file))
+        xml = Nokogiri::XML(open_file) do |c|
+          c.options = Nokogiri::XML::ParseOptions::NOBLANKS
+        end
+        open_file.close
 
-  xml.xpath('//Row').each do |row|
-    row_children = row.children
-    code = row_children.find { |x| x.name == 'Code' }.children.first.text
-    output_data[code] ||= []
-    output_data_instance = {}
-    row_children.each do |row_child|
-      output_data_instance[row_child.name] = row_child.children.first.text
-    end
-    if file =~ /tni/
-      puts "output_data_instance: #{output_data_instance.inspect}"
-      output_data_instance[:mlf_data] = {}
-      unless @mlf_data[code].nil?
-        output_data_instance[:mlf_data] = @mlf_data[code].deep_dup
-        output_data_instance[:mlf_data][:loss_factors].reject! do |x|
-          Time.parse(output_data_instance['ToDate']) < x[:start] ||
-            Time.parse(output_data_instance['FromDate']) >= x[:finish]
+        xml.xpath('//Row').each do |row|
+          row_children = row.children
+          code = row_children.find { |x| x.name == 'Code' }.children.first.text
+          output_data[code] ||= []
+          output_data_instance = {}
+          row_children.each do |row_child|
+            output_data_instance[row_child.name] = row_child.children.first.text
+          end
+          if file =~ /tni/
+            puts "output_data_instance: #{output_data_instance.inspect}"
+            output_data_instance[:mlf_data] = {}
+            unless @mlf_data[code].nil?
+              output_data_instance[:mlf_data] = @mlf_data[code].deep_dup
+              output_data_instance[:mlf_data][:loss_factors].reject! do |x|
+                Time.parse(output_data_instance['ToDate']) < x[:start] ||
+                  Time.parse(output_data_instance['FromDate']) >= x[:finish]
+              end
+              puts 'output_data_instance[:mlf_data][:loss_factors]: ' \
+                   "#{output_data_instance[:mlf_data][:loss_factors].inspect}"
+            end
+          elsif file =~ /dlf/
+            output_data_instance[:nsp_code] = @dlf_data[code]
+          end
+          output_data[code] << output_data_instance
         end
-        puts 'output_data_instance[:mlf_data][:loss_factors]: ' \
-             "#{output_data_instance[:mlf_data][:loss_factors].inspect}"
-      end
-    elsif file =~ /dlf/
-      output_data_instance[:nsp_code] = @dlf_data[code]
-    end
-    output_data[code] << output_data_instance
-  end
 
-  File.write(File.join(@path, output_file), output_data.to_json)
+        File.write(File.join(@path, output_file), output_data.to_json)
 end

data/spec/fixtures/NEM12/NEM12.actual_with_reason_code.csv

@@ -0,0 +1,14 @@
+100,NEM12,200505181432,ENOSI,NEMMCO
+200,4123456789,E1B1,E1,E1,E1,B1234567,KWH,5,20260211
+300,20251227,0.5120,0.4930,0.4170,0.3730,0.3850,0.4170,0.3900,0.4020,0.3910,0.3730,0.4830,0.5080,0.4060,0.4040,0.3640,0.3780,0.3070,0.2620,0.3280,0.2940,0.2930,0.3320,0.2960,0.3290,0.3060,0.2550,0.2920,0.2890,0.4040,0.4200,0.4030,0.4130,0.3780,0.3430,0.4050,0.3440,0.3590,0.3320,0.3050,0.3180,0.2850,0.2770,0.3250,0.2960,0.3140,0.3390,0.2970,0.3240,0.3060,0.3010,0.3900,0.3250,0.3110,0.3310,0.3200,0.3810,0.3060,0.2720,0.3150,0.2980,0.2760,0.2470,0.2160,0.3190,0.3180,0.3060,0.3310,0.2980,0.3140,0.3180,0.2420,0.2760,0.2570,0.2330,0.2700,0.2430,0.2530,0.2610,0.2200,0.3910,0.3660,0.3130,0.2800,0.2280,0.2330,0.2430,0.1850,0.2040,0.2230,0.1830,0.1930,0.1150,0.0730,0.0940,0.0230,0.0070,0.0040,0.0040,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0320,0.0090,0.1130,0.0280,0.0230,0.0000,0.0000,0.0040,0.0010,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.1710,0.0000,0.0000,0.1780,0.0000,0.0000,0.1930,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0190,0.0020,0.0000,0.0000,0.0000,0.0050,0.0140,0.0220,0.0130,0.0640,0.0440,0.0700,0.2380,0.1860,0.1960,0.2000,0.1410,0.0580,0.0170,0.0030,0.0170,0.0750,0.0370,0.0820,0.1060,0.1000,0.1240,0.0900,0.1430,0.1460,0.1510,0.2060,0.1830,0.2180,0.2280,0.1970,0.2380,0.2190,0.1940,0.2420,0.2130,0.2200,0.2300,0.1940,0.2660,0.4730,0.4500,0.5530,0.5600,0.5680,0.6040,0.5620,0.5870,0.6150,0.5770,0.6100,0.6000,0.5710,0.6140,0.5810,0.5820,0.6090,0.5720,0.6590,0.6520,0.7140,0.8750,0.7740,0.8690,0.9730,0.9240,1.0040,0.9260,0.9540,0.9420,0.9540,0.9040,0.9130,0.8790,0.9200,0.8610,0.8650,0.9030,0.8840,0.9090,0.8910,0.7720,0.7800,0.7550,0.7470,0.8830,0.8760,0.8310,0.7710,0.7040,0.7240,0.7540,0.8530,0.8490,0.7540,0.7180,V,,,20251228011206,
+400,1,60,A,,
+400,61,61,A,79,
+400,62,288,A,,
+500,O,,20251228000000,079499.641
+200,4123456789,E1B1,B1,B1,B1,B1234567,KWH,5,20260211
+300,20251227,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0170,0.0400,0.0540,0.1690,0.1730,0.2440,0.2320,0.2400,0.3070,0.2730,0.0240,0.0480,0.0170,0.0340,0.1590,0.3290,0.4210,0.1430,0.1240,0.1670,0.2100,0.3860,0.3710,0.2060,0.1680,0.3940,0.4270,0.3920,0.4480,0.4470,0.4280,0.4480,0.4390,0.4310,0.0640,0.3180,0.4450,0.0430,0.3560,0.4490,0.0590,0.3600,0.5000,0.4820,0.5650,0.5720,0.5390,0.5650,0.5430,0.5470,0.5780,0.5330,0.5690,0.5760,0.5530,0.6200,0.5850,0.5880,0.5870,0.5780,0.6130,0.6050,0.5490,0.6050,0.5570,0.4580,0.4770,0.5630,0.5390,0.5510,0.5830,0.4430,0.5850,0.5460,0.5410,0.5600,0.4840,0.4970,0.4790,0.3430,0.1860,0.2020,0.1000,0.0410,0.1300,0.1250,0.1820,0.1490,0.2100,0.1510,0.1440,0.1530,0.0960,0.0860,0.0860,0.0540,0.0810,0.0150,0.0500,0.0150,0.0180,0.0140,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0210,0.0150,0.0410,0.0290,0.0220,0.0000,0.0040,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,V,,,20251228011206,
+400,1,60,A,,
+400,61,61,A,79,
+400,62,288,A,,
+500,O,,20251228000000,027575.424
+900

data/spec/lib/aemo/meter_data/flag_spec.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe AEMO::MeterData::Flag do
+  describe '.new' do
+    it 'creates a flag with all attributes' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      expect(flag.quality_flag).to eq('E')
+      expect(flag.method_flag).to eq(52)
+      expect(flag.reason_code).to eq(1)
+    end
+
+    it 'creates a flag with nil attributes' do
+      flag = described_class.new
+      expect(flag.quality_flag).to be_nil
+      expect(flag.method_flag).to be_nil
+      expect(flag.reason_code).to be_nil
+    end
+
+    it 'validates quality flag' do
+      expect { described_class.new(quality_flag: 'X') }.to raise_error(ArgumentError, /Invalid quality flag/)
+    end
+
+    it 'validates method flag' do
+      expect { described_class.new(method_flag: 999) }.to raise_error(ArgumentError, /Invalid method flag/)
+    end
+
+    it 'validates reason code' do
+      expect { described_class.new(reason_code: 999) }.to raise_error(ArgumentError, /Invalid reason code/)
+    end
+
+    it 'validates flag combinations' do
+      expect { described_class.new(quality_flag: 'E') }.to raise_error(ArgumentError, /requires a method flag/)
+    end
+  end
+
+  describe '.from_hash' do
+    it 'creates a flag from a hash' do
+      flag = described_class.from_hash({ quality_flag: 'E', method_flag: 52, reason_code: 1 })
+      expect(flag.quality_flag).to eq('E')
+      expect(flag.method_flag).to eq(52)
+      expect(flag.reason_code).to eq(1)
+    end
+
+    it 'returns nil for nil input' do
+      expect(described_class.from_hash(nil)).to be_nil
+    end
+
+    it 'returns the flag if already a Flag instance' do
+      flag = described_class.new(quality_flag: 'A')
+      expect(described_class.from_hash(flag)).to eq(flag)
+    end
+  end
+
+  describe '.normalize' do
+    it 'normalizes nil to actual data flag' do
+      flag = described_class.normalize(nil)
+      expect(flag.quality_flag).to eq('A')
+      expect(flag.method_flag).to be_nil
+      expect(flag.reason_code).to be_nil
+    end
+
+    it 'removes method flag from A quality flag' do
+      flag = described_class.normalize({ quality_flag: 'A', method_flag: 52 })
+      expect(flag.quality_flag).to eq('A')
+      expect(flag.method_flag).to be_nil
+    end
+
+    it 'removes method flag and reason code from V quality flag' do
+      flag = described_class.normalize({ quality_flag: 'V', method_flag: 52, reason_code: 1 })
+      expect(flag.quality_flag).to eq('V')
+      expect(flag.method_flag).to be_nil
+      expect(flag.reason_code).to be_nil
+    end
+
+    it 'preserves E quality flag with method flag' do
+      flag = described_class.normalize({ quality_flag: 'E', method_flag: 52 })
+      expect(flag.quality_flag).to eq('E')
+      expect(flag.method_flag).to eq(52)
+    end
+  end
+
+  describe '#to_quality_method' do
+    it 'returns A for nil quality flag' do
+      flag = described_class.new
+      expect(flag.to_quality_method).to eq('A')
+    end
+
+    it 'returns quality flag when method flag is nil' do
+      flag = described_class.new(quality_flag: 'A')
+      expect(flag.to_quality_method).to eq('A')
+    end
+
+    it 'returns quality flag with formatted method flag' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52)
+      expect(flag.to_quality_method).to eq('E52')
+    end
+  end
+
+  describe '#to_s' do
+    it 'returns nil for nil flag' do
+      flag = described_class.new
+      expect(flag.to_s).to be_nil
+    end
+
+    it 'returns quality flag description' do
+      flag = described_class.new(quality_flag: 'A')
+      expect(flag.to_s).to eq('Actual Data')
+    end
+
+    it 'returns quality flag and method flag description' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52)
+      expect(flag.to_s).to eq('Forward Estimated Data - Previous Read')
+    end
+
+    it 'returns quality flag, method flag, and reason code description' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      expect(flag.to_s).to eq('Forward Estimated Data - Previous Read - Meter/Equipment Changed')
+    end
+  end
+
+  describe '#to_h' do
+    it 'returns a hash representation' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      expect(flag.to_h).to eq({ quality_flag: 'E', method_flag: 52, reason_code: 1 })
+    end
+  end
+
+  describe '#==' do
+    it 'compares two flags' do
+      flag1 = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      flag2 = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      expect(flag1).to eq(flag2)
+    end
+
+    it 'compares flag with hash' do
+      flag = described_class.new(quality_flag: 'E', method_flag: 52, reason_code: 1)
+      expect(flag).to eq({ quality_flag: 'E', method_flag: 52, reason_code: 1 })
+    end
+  end
+end

data/spec/lib/aemo/nem12_spec.rb

@@ -80,7 +80,8 @@ describe AEMO::NEM12 do
           '200,NEM1201002,E1E2,E1,E1,N1,01002,KWH,30,',
           '300,20050318,315.15,313.8,296.55,298.5,295.2,298.95,300.75,322.95,330.45,350.7,345.75,346.95,345.9,348.6,300.15,337.5,336.75,345.9,330.45,327.15,334.8,345.75,335.85,320.1,325.5,325.2,326.4,330.6,332.7,332.25,321.0,316.5,299.85,302.4,301.05,263.85,255.45,142.05,138.3,138.3,136.8,138.3,136.05,135.75,135.75,136.65,136.05,130.8,A,,,20050319014041,',
           '200,NEM1201002,E1E2,E2,E2,N2,01002,KWH,30,',
-          '300,20050318,103.05,98.85,81.15,75.6,72.15,73.95,74.55,81.15,89.25,124.2,125.7,128.7,136.8,151.05,177.9,174.45,204.0,210.15,180.15,164.4,187.95,211.95,193.8,122.85,124.8,121.2,129.3,131.25,130.95,130.05,118.05,105.75,77.1,75.9,75.0,51.15,44.4,12.3,12.75,12.15,12.45,11.55,14.4,14.55,15.0,14.7,15.75,21.9,A,,,20050319014041,', '900',
+          '300,20050318,103.05,98.85,81.15,75.6,72.15,73.95,74.55,81.15,89.25,124.2,125.7,128.7,136.8,151.05,177.9,174.45,204.0,210.15,180.15,164.4,187.95,211.95,193.8,122.85,124.8,121.2,129.3,131.25,130.95,130.05,118.05,105.75,77.1,75.9,75.0,51.15,44.4,12.3,12.75,12.15,12.45,11.55,14.4,14.55,15.0,14.7,15.75,21.9,A,,,20050319014041,',
+          '900',
           ''
         ].join("\r\n")
       end
@@ -106,11 +107,9 @@ describe AEMO::NEM12 do
           '400,1,10,F52,71,',
           '400,11,48,E52,,',
           '200,NEM1204062,E1,E1,E1,N1,04062,KWH,30,20050503',
-          '300,20040528,0.68,0.653,0.62,0.623,0.618,0.625,0.613,0.623,0.618,0.615,0.613,0.76,0.665,0.638,0.61,0.648,0.65,0.645,0.895,0.668,0.645,0.648,0.655,0.73,0.695,0.67,0.638,0.643,0.64,0.723,0.653,0.645,0.633,0.71,0.683,0.648,0.625,0.63,0.625,0.63,0.638,0.635,0.633,0.638,0.673,0.765,0.65,0.628,V,,,20040609000001,',
-          '400,1,48,E52,,',
+          '300,20040528,0.68,0.653,0.62,0.623,0.618,0.625,0.613,0.623,0.618,0.615,0.613,0.76,0.665,0.638,0.61,0.648,0.65,0.645,0.895,0.668,0.645,0.648,0.655,0.73,0.695,0.67,0.638,0.643,0.64,0.723,0.653,0.645,0.633,0.71,0.683,0.648,0.625,0.63,0.625,0.63,0.638,0.635,0.633,0.638,0.673,0.765,0.65,0.628,E52,,,20040609000001,',
           '200,NEM1204062,E1,E1,E1,N1,04062,KWH,30,20050503',
-          '300,20040529,0.633,0.613,0.628,0.618,0.625,0.623,0.623,0.613,0.655,0.663,0.645,0.708,0.608,0.618,0.63,0.625,0.62,0.635,0.63,0.638,0.693,0.71,0.683,0.645,0.638,0.653,0.653,0.648,0.655,0.745,0.69,0.695,0.68,0.643,0.645,0.635,0.628,0.625,0.635,0.628,0.673,0.688,0.685,0.66,0.638,0.718,0.638,0.63,V,,,20040609000001,',
-          '400,1,48,E52,,',
+          '300,20040529,0.633,0.613,0.628,0.618,0.625,0.623,0.623,0.613,0.655,0.663,0.645,0.708,0.608,0.618,0.63,0.625,0.62,0.635,0.63,0.638,0.693,0.71,0.683,0.645,0.638,0.653,0.653,0.648,0.655,0.745,0.69,0.695,0.68,0.643,0.645,0.635,0.628,0.625,0.635,0.628,0.673,0.688,0.685,0.66,0.638,0.718,0.638,0.63,E52,,,20040609000001,',
           '900',
           ''
         ].join("\r\n")
@@ -136,9 +135,9 @@ describe AEMO::NEM12 do
       Dir.entries(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'NEM12'))
          .reject { |f| %w[. .. .DS_Store].include?(f) }
          .each do |file|
-        described_class.parse_nem12_file(fixture(File.join('NEM12', file))).each do |nem12|
-          expect(nem12.nmi_identifier).to be_a String
-        end
+           described_class.parse_nem12_file(fixture(File.join('NEM12', file))).each do |nem12|
+             expect(nem12.nmi_identifier).to be_a String
+           end
       end
     end
   end
@@ -173,6 +172,31 @@ describe AEMO::NEM12 do
       nem12_empty_cells_300_record = fixture(File.join('NEM12-Errors', 'NEM12#EmptyCells300Record#CNRGYMDP#NEMMCO.csv'))
       expect { described_class.parse_nem12_file(nem12_empty_cells_300_record) }.to raise_error(ArgumentError)
     end
+
+    it 'parses actual data flags explicitly' do
+      nem12_filepath = fixture(File.join('NEM12', 'NEM12#000000000000001#CNRGYMDP#NEMMCO.csv'))
+      nem12s = described_class.parse_nem12_file(nem12_filepath)
+      expect(nem12s.first.interval_data.first[:flag].quality_flag).to eq('A')
+      expect(nem12s.first.interval_data.first[:flag].method_flag).to be_nil
+      expect(nem12s.first.interval_data.first[:flag].reason_code).to be_nil
+    end
+
+    it 'parses substituted data flags with method flags' do
+      nem12_filepath = fixture(File.join('NEM12', 'NEM12#000000000000004#CNRGYMDP#NEMMCO.csv'))
+      nem12s = described_class.parse_nem12_file(nem12_filepath)
+      # First 10 intervals have F52 flag
+      expect(nem12s.first.interval_data.first[:flag].quality_flag).to eq('F')
+      expect(nem12s.first.interval_data.first[:flag].method_flag).to eq(52)
+      expect(nem12s.first.interval_data.first[:flag].reason_code).to eq(71)
+    end
+
+    it 'parses estimated data flags' do
+      nem12_filepath = fixture(File.join('NEM12', 'NEM12#000000000000004#CNRGYMDP#NEMMCO.csv'))
+      nem12s = described_class.parse_nem12_file(nem12_filepath)
+      # Intervals 11-48 have E52 flag
+      expect(nem12s.first.interval_data[10][:flag].quality_flag).to eq('E')
+      expect(nem12s.first.interval_data[10][:flag].method_flag).to eq(52)
+    end
   end
 
   describe '#parse_nem12_400' do
@@ -180,14 +204,36 @@ describe AEMO::NEM12 do
       nem12_empty_cells_400_record = fixture(File.join('NEM12-Errors', 'NEM12#EmptyCells400Record#CNRGYMDP#NEMMCO.csv'))
       expect { described_class.parse_nem12_file(nem12_empty_cells_400_record) }.to raise_error(ArgumentError)
     end
+
+    it 'parses 400 records and updates interval flags' do
+      nem12_filepath = fixture(File.join('NEM12', 'NEM12#000000000000004#CNRGYMDP#NEMMCO.csv'))
+      nem12s = described_class.parse_nem12_file(nem12_filepath)
+      # Verify that 400 records override the V flag from 300 record
+      expect(nem12s.first.interval_data.first[:flag].quality_flag).to eq('F')
+      expect(nem12s.first.interval_data[10][:flag].quality_flag).to eq('E')
+    end
   end
 
-  describe '#flag_to_s' do
-    it 'converts the flags to a string' do
-      flag = { quality_flag: 'S', method_flag: 11, reason_code: 53 }
+  describe 'flag handling edge cases' do
+    it 'handles actual data with reason code' do
+      nem12_filepath = fixture(File.join('NEM12', 'NEM12.actual_with_reason_code.csv'))
+      nem12s = described_class.parse_nem12_file(nem12_filepath)
+      # Check that actual data with reason code is parsed correctly
+      interval_with_reason = nem12s.first.interval_data.find { |x| x[:flag].reason_code == 79 }
+      expect(interval_with_reason).not_to be_nil
+      expect(interval_with_reason[:flag].quality_flag).to eq('A')
+      expect(interval_with_reason[:flag].method_flag).to be_nil
+      expect(interval_with_reason[:flag].reason_code).to eq(79)
+    end
+
+    it 'maintains backward compatibility with nil flags' do
       nem12 = described_class.new('NEEE000010')
-      expect(nem12.flag_to_s(flag))
-        .to eq 'Substituted Data - Check - Bees/Wasp In Meter Box'
+      nem12.instance_variable_set(:@data_details, [{ interval_length: 30 }])
+      nem12.instance_variable_set(:@interval_data, [
+                                    { flag: nil, value: 1.0, datetime: Time.now, data_details: { interval_length: 30 } }
+                                  ])
+      # Should not raise error
+      expect { nem12.to_nem12_300_csv }.not_to raise_error
     end
   end
 
@@ -210,4 +256,104 @@ describe AEMO::NEM12 do
       expect(nem12.to_nem12_csv).to eq(expected)
     end
   end
+
+  describe '#to_nem12_300_csv with uniform flags' do
+    let(:nem12) { described_class.new('NEEE000010') }
+    let(:base_time) { Time.parse('2024-01-01 00:30:00 +1000') }
+
+    before do
+      nem12.instance_variable_set(:@data_details, [{ interval_length: 30 }])
+    end
+
+    it 'uses quality method from uniform actual data flags without 400 records' do
+      intervals = (0...48).map do |i|
+        {
+          flag: AEMO::MeterData::Flag.new(quality_flag: 'A', method_flag: nil, reason_code: nil),
+          value: 1.0 + i,
+          datetime: base_time + (i * 30 * 60),
+          data_details: { interval_length: 30 }
+        }
+      end
+      nem12.instance_variable_set(:@interval_data, intervals)
+
+      output = nem12.to_nem12_300_csv
+      expect(output).to include('300,20240101')
+      expect(output).to include(',A,,,')
+      expect(output).not_to include('400,')
+    end
+
+    it 'uses quality method from uniform estimated data flags without 400 records' do
+      intervals = (0...48).map do |i|
+        {
+          flag: AEMO::MeterData::Flag.new(quality_flag: 'E', method_flag: 52, reason_code: nil),
+          value: 1.0 + i,
+          datetime: base_time + (i * 30 * 60),
+          data_details: { interval_length: 30 }
+        }
+      end
+      nem12.instance_variable_set(:@interval_data, intervals)
+
+      output = nem12.to_nem12_300_csv
+      expect(output).to include('300,20240101')
+      expect(output).to include(',E52,,,')
+      expect(output).not_to include('400,')
+    end
+
+    it 'uses quality method from uniform substituted data flags with reason code' do
+      intervals = (0...48).map do |i|
+        {
+          flag: AEMO::MeterData::Flag.new(quality_flag: 'S', method_flag: 11, reason_code: 53),
+          value: 1.0 + i,
+          datetime: base_time + (i * 30 * 60),
+          data_details: { interval_length: 30 }
+        }
+      end
+      nem12.instance_variable_set(:@interval_data, intervals)
+
+      output = nem12.to_nem12_300_csv
+      expect(output).to include('300,20240101')
+      expect(output).to include(',S11,53,')
+      expect(output).not_to include('400,')
+    end
+
+    it 'uses V and generates 400 records when flags differ' do
+      intervals = (0...48).map do |i|
+        flag = if i < 10
+                 AEMO::MeterData::Flag.new(quality_flag: 'F', method_flag: 52, reason_code: 71)
+               else
+                 AEMO::MeterData::Flag.new(quality_flag: 'E', method_flag: 52, reason_code: nil)
+               end
+        {
+          flag:,
+          value: 1.0 + i,
+          datetime: base_time + (i * 30 * 60),
+          data_details: { interval_length: 30 }
+        }
+      end
+      nem12.instance_variable_set(:@interval_data, intervals)
+
+      output = nem12.to_nem12_300_csv
+      expect(output).to include('300,20240101')
+      expect(output).to include(',V,,,')
+      expect(output).to include('400,1,10,F52,71,')
+      expect(output).to include('400,11,48,E52,,')
+    end
+
+    it 'handles nil flags as nil data' do
+      intervals = (0...48).map do |i|
+        {
+          flag: nil,
+          value: 1.0 + i,
+          datetime: base_time + (i * 30 * 60),
+          data_details: { interval_length: 30 }
+        }
+      end
+      nem12.instance_variable_set(:@interval_data, intervals)
+
+      output = nem12.to_nem12_300_csv
+      expect(output).to include('300,20240101')
+      expect(output).to include(',,,,')
+      expect(output).not_to include('400,')
+    end
+  end
 end