Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OMP description changes #1687

Merged
merged 3 commits into from
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void SellingTechniqueType_ShouldHaveValues()
values.Should().Contain(c => c.Key.Equals(0) && c.Value.Equals("Direct selling to end user (mail, order, internet etc)"));
values.Should().Contain(c => c.Key.Equals(1) && c.Value.Equals("Indirect selling (other)"));
values.Should().Contain(c => c.Key.Equals(2) && c.Value.Equals("Both Direct and Indirect Selling to End User"));
values.Should().Contain(c => c.Key.Equals(3) && c.Value.Equals("Online Marketplaces and Fulfilment Houses"));
values.Should().Contain(c => c.Key.Equals(3) && c.Value.Equals("Online marketplace"));
}
}
}
4 changes: 2 additions & 2 deletions src/EA.Weee.Core/DirectRegistrant/SellingTechniqueType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public enum SellingTechniqueType
[Display(Name = "Both Direct and Indirect Selling to End User")]
Both = 2,

[Display(Name = "Online Marketplaces and Fulfilment Houses")]
OnlineMarketplacesAndFulfilmentHouses = 3,
[Display(Name = "Online marketplace")]
OnlineMarketplace = 3,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum SellingTechnique
{
DirectSellingToEndUser,
IndirectSellingToEndUser,
Both
Both,
OnlineMarketplace
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ BEGIN
WHEN 0 THEN 'Direct Selling to End User'
WHEN 1 THEN 'Indirect Selling to End User'
WHEN 2 THEN 'Both Direct and Indirect Selling to End User'
WHEN 3 THEN 'Online Marketplaces and Fulfilment Houses'
WHEN 3 THEN 'Online marketplace'
ELSE ''
END AS 'SellingTechniqueType',

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class SellingTechniqueType : Enumeration
public static readonly SellingTechniqueType DirectSellingtoEndUser = new SellingTechniqueType(0, "Direct Selling to End User");
public static readonly SellingTechniqueType IndirectSellingtoEndUser = new SellingTechniqueType(1, "Indirect Selling to End User");
public static readonly SellingTechniqueType Both = new SellingTechniqueType(2, "Both Direct and Indirect Selling to End User");
public static readonly SellingTechniqueType OnlineMarketplacesAndFulfilmentHouses = new SellingTechniqueType(3, "Online Marketplaces and Fulfilment Houses");
public static readonly SellingTechniqueType OnlineMarketplace = new SellingTechniqueType(3, "Online marketplace");

protected SellingTechniqueType()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task HandleAsync_ReturnsFileContent()
"Charge value (GBP)",
"Charge band",
"Selling technique",
"Online market places charge value",
"Online marketplace charge value",
"Issued date",
"Reg. Off. or PPoB country",
"Includes annual charge"
Expand All @@ -83,7 +83,7 @@ public async Task HandleAsync_PutsChargeValueInCorrectColumn()
CreateDummyProducerSubmission(1m, SellingTechniqueType.DirectSellingtoEndUser),
CreateDummyProducerSubmission(2m, SellingTechniqueType.IndirectSellingtoEndUser),
CreateDummyProducerSubmission(3m, SellingTechniqueType.Both),
CreateDummyProducerSubmission(4m, SellingTechniqueType.OnlineMarketplacesAndFulfilmentHouses),
CreateDummyProducerSubmission(4m, SellingTechniqueType.OnlineMarketplace),
};

A.CallTo(() => dataAccess.FetchInvoicedProducerSubmissionsAsync(A<UKCompetentAuthority>.Ignored, A<int>.Ignored, A<Guid?>.Ignored)).Returns(Task.FromResult<IEnumerable<ProducerSubmission>>(producerSubmissions));
Expand All @@ -108,7 +108,7 @@ public async Task HandleAsync_PutsChargeValueInCorrectColumn()
"Charge value (GBP)",
"Charge band",
"Selling technique",
"Online market places charge value",
"Online marketplace charge value",
"Issued date",
"Reg. Off. or PPoB country",
"Includes annual charge"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public async Task GenerateProducerData_WithSellingTechnique_ReturnsProducerWithM
public async Task GenerateProducerData_WithSellingTechnique_As_OMP_ReturnsProducerWithMatchingSellingTechnique()
{
var builder = new GenerateProducerDataTestsBuilder();
builder.SellingTechnique = sellingTechniqueType.OnlineMarketplacesAndFulfilmentHouses;
builder.SellingTechnique = sellingTechniqueType.OnlineMarketplace;

var result = await builder.InvokeGenerateProducerDataWithSingleResult();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public async Task ProcessXmlfile_ParsesXMLFile_SavesValidProducers()
[Fact]
public async Task ProcessXmlfile_ParsesXMLFile_SavesValidProducers_As_OMP()
{
IEnumerable<ProducerSubmission> generatedProducers = new[] { TestProducer("ForestMoonOfEndor", SellingTechniqueType.OnlineMarketplacesAndFulfilmentHouses) };
IEnumerable<ProducerSubmission> generatedProducers = new[] { TestProducer("ForestMoonOfEndor", SellingTechniqueType.OnlineMarketplace) };

A.CallTo(() => generator.GenerateProducers(Message, A<MemberUpload>.Ignored, A<Dictionary<string, ProducerCharge>>.Ignored))
.Returns(Task.FromResult(generatedProducers));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public async Task<FileInfo> HandleAsync(FetchIssuedChargesCsv message)
csvWriter.DefineColumn("Charge value (GBP)", ps => IsOMP(ps) ? string.Empty : ps.ChargeThisUpdate);
csvWriter.DefineColumn("Charge band", ps => ps.ChargeBandAmount.ChargeBand);
csvWriter.DefineColumn("Selling technique", ps => EnumHelper.GetDisplayName(Enumeration.FromValue<SellingTechniqueType>(ps.SellingTechniqueType)));
csvWriter.DefineColumn("Online market places charge value", ps => IsOMP(ps) ? ps.ChargeThisUpdate : string.Empty);
csvWriter.DefineColumn("Online marketplace charge value", ps => IsOMP(ps) ? ps.ChargeThisUpdate : string.Empty);
csvWriter.DefineColumn("Issued date", ps => ps.MemberUpload.InvoiceRun.IssuedDate.ToString("dd/MM/yyyy HH:mm:ss"));
csvWriter.DefineColumn(@"Reg. Off. or PPoB country", ps => ps.RegOfficeOrPBoBCountry);
csvWriter.DefineColumn(@"Includes annual charge", ps => ps.HasAnnualCharge);
Expand Down Expand Up @@ -82,7 +82,7 @@ public async Task<FileInfo> HandleAsync(FetchIssuedChargesCsv message)

private static bool IsOMP(ProducerSubmission ps)
{
return ps.SellingTechniqueType == SellingTechniqueType.OnlineMarketplacesAndFulfilmentHouses.Value;
return ps.SellingTechniqueType == SellingTechniqueType.OnlineMarketplace.Value;
}
}
}
4 changes: 2 additions & 2 deletions src/EA.Weee.Xml/MemberRegistration/v3schema.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1728,8 +1728,8 @@ public enum sellingTechniqueType {
Both,

/// <remarks/>
[XmlEnum("Online Marketplaces and Fulfilment Houses")]
OnlineMarketplacesAndFulfilmentHouses,
[XmlEnum("Online marketplace")]
OnlineMarketplace,
}

/// <remarks/>
Expand Down
4 changes: 2 additions & 2 deletions src/EA.Weee.Xml/MemberRegistration/v3schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
= 06/07/2015 Owen H 3.05 Removed unbounded maxOccurs constraint from overseasContact on overseasProducerType.
= 15/07/2015 Owen H 3.06 Removed unused billingAddressType.
= 07/10/2015 Graham A-T 3.07 Updated producerType to make authorisedRepresentative optional.
= 14/03/2025 Sreedhar 3.08 Amended sellingTechnique (Added Online Marketplaces and Fulfilment Houses)
= 14/03/2025 Sreedhar 3.08 Amended sellingTechnique (Added Online marketplace)
================================================================================
-->
<xs:element name="scheme" type="schemeType">
Expand Down Expand Up @@ -341,7 +341,7 @@
<xs:enumeration value="Direct Selling to End User"/>
<xs:enumeration value="Indirect Selling to End User"/>
<xs:enumeration value="Both Direct and Indirect Selling to End User"/>
<xs:enumeration value="Online Marketplaces and Fulfilment Houses"/>
<xs:enumeration value="Online marketplace"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="countryType">
Expand Down