diff --git a/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java b/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
index 025df1a4f655..1d7cacaead05 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
@@ -11,6 +11,8 @@ public class LicenseDto {
 
     private LocalDateTime endDate;
 
+    private String licenseType;
+
     public UUID getId() {
         return id;
     }
@@ -35,4 +37,12 @@ public void setEndDate(LocalDateTime endDate) {
         this.endDate = endDate;
     }
 
+    public String getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(String licenseType) {
+        this.licenseType = licenseType;
+    }
+
 }
diff --git a/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java b/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
index 100588b45d26..0d8904e220ae 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
@@ -6,6 +6,7 @@
 import java.time.ZoneOffset;
 
 import org.mapstruct.AfterMapping;
+import org.mapstruct.Condition;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
@@ -40,4 +41,13 @@ default boolean isEndDateInTwoWeeks(LicenseDto licenseDto) {
             .toDays() <= 14;
     }
 
-}
+    @Condition
+    default boolean mapsToExpectedLicenseType(String licenseType) {
+        try {
+            return licenseType != null && License.LicenseType.valueOf(licenseType) != null;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mapstruct/src/main/java/com/baeldung/expression/model/License.java b/mapstruct/src/main/java/com/baeldung/expression/model/License.java
index 71e4f086c0bb..e36e278a572f 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/model/License.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/model/License.java
@@ -3,7 +3,6 @@
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
-
 public class License {
 
     private UUID id;
@@ -16,6 +15,8 @@ public class License {
 
     private boolean renewalRequired;
 
+    private LicenseType licenseType;
+
     public UUID getId() {
         return id;
     }
@@ -55,4 +56,16 @@ public boolean isRenewalRequired() {
     public void setRenewalRequired(boolean renewalRequired) {
         this.renewalRequired = renewalRequired;
     }
-}
+
+    public enum LicenseType {
+        INDIVIDUAL, FAMILY
+    }
+
+    public LicenseType getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(LicenseType licenseType) {
+        this.licenseType = licenseType;
+    }
+}
\ No newline at end of file
diff --git a/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java b/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
index dcdda5c1ac78..d7521e81f57e 100644
--- a/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
+++ b/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
@@ -6,6 +6,7 @@
 import java.time.LocalDateTime;
 import java.util.UUID;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
@@ -74,4 +75,31 @@ void givenLicenseDtoWithoutId_WhenMapperMethodIsInvoked_ThenLicenseShouldBePopul
         assertThat(license.getId()).isSameAs(id);
     }
 
+    @Test
+    void givenLicenseDtoWithoutLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithoutLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNull(license.getLicenseType());
+    }
+
+    @Test
+    void givenLicenseDtoWithInvalidLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithoutLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        licenseDto.setLicenseType("invalid_license_type");
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNull(license.getLicenseType());
+    }
+
+    @Test
+    void givenLicenseDtoWithValidLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithMatchingLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        licenseDto.setLicenseType("INDIVIDUAL");
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNotNull(license.getLicenseType());
+        assertThat(license.getLicenseType()).isEqualTo(License.LicenseType.INDIVIDUAL);
+    }
+
 }
\ No newline at end of file